diff options
-rw-r--r-- | dracut/adduser.sh | 14 | ||||
-rw-r--r-- | dracut/locale.sh | 7 | ||||
-rw-r--r-- | mklive.sh.in | 6 |
3 files changed, 18 insertions, 9 deletions
diff --git a/dracut/adduser.sh b/dracut/adduser.sh index aaee9f3..246b20d 100644 --- a/dracut/adduser.sh +++ b/dracut/adduser.sh @@ -22,12 +22,14 @@ if [ -f ${NEWROOT}/etc/sudoers ]; then fi # Enable autologin for agetty(8). -rm -f "${NEWROOT}/etc/systemd/system/getty.target.wants/getty@tty1.service" -sed -e "s|/sbin/agetty --noclear|& -a ${USERNAME}|g" \ - "${NEWROOT}/usr/lib/systemd/system/getty@.service" > \ - "${NEWROOT}/etc/systemd/system/getty@.service" -ln -sf /etc/systemd/system/getty@.service \ - "${NEWROOT}/etc/systemd/system/getty.target.wants/getty@tty1.service" +if [ -d ${NEWROOT}/etc/systemd/system ]; then + rm -f "${NEWROOT}/etc/systemd/system/getty.target.wants/getty@tty1.service" + sed -e "s|/sbin/agetty --noclear|& -a ${USERNAME}|g" \ + "${NEWROOT}/usr/lib/systemd/system/getty@.service" > \ + "${NEWROOT}/etc/systemd/system/getty@.service" + ln -sf /etc/systemd/system/getty@.service \ + "${NEWROOT}/etc/systemd/system/getty.target.wants/getty@tty1.service" +fi if [ -d ${NEWROOT}/etc/polkit-1 ]; then # If polkit is installed allow users in the wheel group to run anything. diff --git a/dracut/locale.sh b/dracut/locale.sh index bad138b..d7f5190 100644 --- a/dracut/locale.sh +++ b/dracut/locale.sh @@ -14,4 +14,9 @@ echo "LC_COLLATE=C" >> $NEWROOT/etc/locale.conf # set keymap too. KEYMAP=$(getarg vconsole.keymap) [ -z "$KEYMAP" ] && KEYMAP="us" -sed -e "s,^KEYMAP=.*,KEYMAP=$KEYMAP," -i $NEWROOT/etc/vconsole.conf + +if [ -f ${NEWROOT}/etc/vconsole.conf ]; then + sed -e "s,^KEYMAP=.*,KEYMAP=$KEYMAP," -i $NEWROOT/etc/vconsole.conf +elif [ -f ${NEWROOT}/etc/rc.conf ]; then + sed -e "s,^KEYMAP=.*,KEYMAP=$KEYMAP," -i $NEWROOT/etc/rc.conf.conf +fi diff --git a/mklive.sh.in b/mklive.sh.in index 7281306..d47f611 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -113,8 +113,10 @@ install_packages() { ${XBPS_REMOVE_CMD} -r $ROOTFS $XBPS_CACHEDIR -o >>$LOGFILE 2>&1 # Enable choosen UTF-8 locale and generate it into the target rootfs. - sed -e "s/\#\(${LOCALE}.*\)/\1/g" -i $ROOTFS/etc/default/libc-locales - xbps-uchroot $ROOTFS xbps-reconfigure -f glibc-locales >>$LOGFILE 2>&1 + if [ -f $ROOTFS/etc/default/libc-locales ]; then + sed -e "s/\#\(${LOCALE}.*\)/\1/g" -i $ROOTFS/etc/default/libc-locales + xbps-uchroot $ROOTFS xbps-reconfigure -f glibc-locales >>$LOGFILE 2>&1 + fi if [ -x installer.sh ]; then install -Dm755 installer.sh $ROOTFS/usr/sbin/void-installer |