diff options
| author | Juan RP <xtraeme@gmail.com> | 2014-12-29 11:26:55 +0100 |
|---|---|---|
| committer | Juan RP <xtraeme@gmail.com> | 2014-12-29 11:26:55 +0100 |
| commit | 8134257155f517f218c797375cf70357b934c034 (patch) | |
| tree | 338a90a8fd22a24212ef188efee579b549683fd6 /mklive.sh.in | |
| parent | 653f1d2ad9c2865a9435b1aa9bff8cb1c68c4957 (diff) | |
| download | hrmpf-8134257155f517f218c797375cf70357b934c034.tar.gz hrmpf-8134257155f517f218c797375cf70357b934c034.tar.xz hrmpf-8134257155f517f218c797375cf70357b934c034.zip | |
mklive: more fixes for musl images.
- Reconfigure util-linux only if it's installed in rootdir. - dracut: force add the ahci kernel module and build a non hostonly image.
Diffstat (limited to 'mklive.sh.in')
| -rw-r--r-- | mklive.sh.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mklive.sh.in b/mklive.sh.in index 2294faa..38cf04b 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -104,8 +104,10 @@ install_packages() { if [ -f $ROOTFS/etc/default/libc-locales ]; then sed -e "s/\#\(${LOCALE}.*\)/\1/g" -i $ROOTFS/etc/default/libc-locales xbps-reconfigure -r $ROOTFS -f glibc-locales || die "Failed to reconfigure glibc-locales" + fi + if xbps-query -r $ROOTFS util-linux >/dev/null 2>&1; then # reconfigure util-linux just to be safe - xbps-reconfigure -r $ROOTFS -f util-linux || die "Failed to reconfigure util-linux" + xbps-reconfigure -r $ROOTFS -f util-linux fi if [ -x installer.sh ]; then @@ -126,8 +128,8 @@ generate_initramfs() { else _args="--omit systemd" fi - xbps-uchroot $ROOTFS env -i /usr/bin/dracut --${INITRAMFS_COMPRESSION} \ - --force-add "vmklive" ${_args} "/boot/initrd" $KERNELVERSION + xbps-uchroot $ROOTFS env -i /usr/bin/dracut -N --${INITRAMFS_COMPRESSION} \ + --add-drivers "ahci" --force-add "vmklive" ${_args} "/boot/initrd" $KERNELVERSION [ $? -ne 0 ] && die "Failed to generate the initramfs" mv $ROOTFS/boot/initrd $BOOT_DIR |