diff options
| author | Juan RP <xtraeme@gmail.com> | 2012-08-29 16:55:00 +0200 |
|---|---|---|
| committer | Juan RP <xtraeme@gmail.com> | 2012-08-29 16:55:00 +0200 |
| commit | 5f3833b18f063e2700691423497955a7cb9b35d8 (patch) | |
| tree | 486a5ac0e9cfe892a614d9779b7362d2e0fcbc83 | |
| parent | 0afde3876fb7f7446899e9e20f9115f32c53e2b8 (diff) | |
| download | hrmpf-5f3833b18f063e2700691423497955a7cb9b35d8.tar.gz hrmpf-5f3833b18f063e2700691423497955a7cb9b35d8.tar.xz hrmpf-5f3833b18f063e2700691423497955a7cb9b35d8.zip | |
Update for new dracut (rd.liveimg) and /usr switch.
| -rw-r--r-- | dracut/vmklive-adduser.sh | 30 | ||||
| -rw-r--r-- | isolinux/isolinux.cfg.in | 2 |
2 files changed, 16 insertions, 16 deletions
diff --git a/dracut/vmklive-adduser.sh b/dracut/vmklive-adduser.sh index 57d25d8..31ab595 100644 --- a/dracut/vmklive-adduser.sh +++ b/dracut/vmklive-adduser.sh @@ -19,32 +19,32 @@ if [ -f ${NEWROOT}/etc/sudoers ]; then fi # Enable autologin for getty(1). -if [ -f ${NEWROOT}/lib/systemd/system/getty@.service ]; then +if [ -f ${NEWROOT}/usr/lib/systemd/system/getty@.service ]; then rm -f "${NEWROOT}/etc/systemd/system/getty.target.wants/getty@tty1.service" - sed -e "s|/sbin/agetty --noclear|/sbin/live-getty|g" \ - "${NEWROOT}/lib/systemd/system/getty@.service" > \ + sed -e "s|/sbin/agetty --noclear|/usr/sbin/live-getty|g" \ + "${NEWROOT}/usr/lib/systemd/system/getty@.service" > \ "${NEWROOT}/etc/systemd/system/getty.target.wants/getty@tty1.service" fi -# Create /sbin/live-getty. -cat > ${NEWROOT}/sbin/live-getty <<_EOF +# Create /usr/sbin/live-getty. +cat > ${NEWROOT}/usr&sbin/live-getty <<_EOF #!/bin/sh -if [ -x /sbin/agetty ]; then - _getty=/sbin/agetty -elif [ -x /sbin/getty ]; then - _getty=/sbin/getty +if [ -x /usr/sbin/agetty ]; then + _getty=/usr&sbin/agetty +elif [ -x /usr/sbin/getty ]; then + _getty=/usr/sbin/getty fi -exec \${_getty} -n -l /sbin/live-autologin \$* +exec \${_getty} -n -l /usr/sbin/live-autologin \$* _EOF -chmod 755 ${NEWROOT}/sbin/live-getty +chmod 755 ${NEWROOT}/usr/sbin/live-getty -# Create /sbin/live-autologin. -cat > ${NEWROOT}/sbin/live-autologin <<_EOF +# Create /usr/sbin/live-autologin. +cat > ${NEWROOT}/usr/sbin/live-autologin <<_EOF #!/bin/sh . /etc/default/live.conf -exec /bin/login -f \$USERNAME +exec /usr/bin/login -f \$USERNAME _EOF -chmod 755 ${NEWROOT}/sbin/live-autologin +chmod 755 ${NEWROOT}/usr/sbin/live-autologin diff --git a/isolinux/isolinux.cfg.in b/isolinux/isolinux.cfg.in index ad6df88..68bbaaa 100644 --- a/isolinux/isolinux.cfg.in +++ b/isolinux/isolinux.cfg.in @@ -23,7 +23,7 @@ MENU COLOR sel * #ffffffff #FF5255FF * LABEL linux MENU LABEL Boot Void GNU/Linux @@KERNVER@@ @@ARCH@@ KERNEL /boot/vmlinuz -APPEND initrd=/boot/initrd.lz root=live:CDLABEL=VOID_LIVE rootfstype=auto ro liveimg rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 vconsole.keymap=@@KEYMAP@@ vconsole.unicode=1 locale.LANG=@@LOCALE@@ +APPEND initrd=/boot/initrd.lz root=live:CDLABEL=VOID_LIVE rootfstype=auto ro rd.liveimg rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 vconsole.keymap=@@KEYMAP@@ vconsole.unicode=1 locale.LANG=@@LOCALE@@ LABEL c MENU LABEL Boot first HD found by BIOS LOCALBOOT 0x80 |