From a30890cffc5fce967396353c8ecaabf871e57ad8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 2 Dec 2014 19:53:04 +0100 Subject: dracut/adduser: autologin if live.autologin is set in the kernel cmdline. --- dracut/adduser.sh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'dracut') diff --git a/dracut/adduser.sh b/dracut/adduser.sh index 6d0142c..68b6bd4 100644 --- a/dracut/adduser.sh +++ b/dracut/adduser.sh @@ -6,8 +6,10 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh echo void-live > ${NEWROOT}/etc/hostname +AUTOLOGIN=$(getarg live.autologin) USERNAME=$(getarg live.user) USERSHELL=$(getarg live.shell) + [ -z "$USERNAME" ] && USERNAME=anon [ -x $NEWROOT/bin/bash -a -z "$USERSHELL" ] && USERSHELL=/bin/bash [ -z "$USERSHELL" ] && USERSHELL=/bin/sh @@ -48,3 +50,7 @@ polkit.addRule(function(action, subject) { _EOF chroot ${NEWROOT} chown polkitd:polkitd /etc/polkit-1/rules.d/void-live.rules fi + +if [ -n "$AUTOLOGIN" ]; then + sed -i "s,GETTY_ARGS=\"--noclear\",GETTY_ARGS=\"--noclear -a $USERNAME\",g" ${NEWROOT}/etc/sv/agetty-tty1/run +fi -- cgit 1.4.1 From ca99f9f5bb66a4e160ac3404253d5fb7a79559eb Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 2 Dec 2014 21:03:58 +0100 Subject: New dracut module helper to enable runit services. --- dracut/module-setup.sh | 1 + dracut/services.sh | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 dracut/services.sh (limited to 'dracut') diff --git a/dracut/module-setup.sh b/dracut/module-setup.sh index a44efd2..765f41f 100644 --- a/dracut/module-setup.sh +++ b/dracut/module-setup.sh @@ -18,4 +18,5 @@ install() { inst_hook pre-pivot 02 "$moddir/display-manager-autologin.sh" inst_hook pre-pivot 03 "$moddir/copy-initramfs.sh" inst_hook pre-pivot 04 "$moddir/locale.sh" + inst_hook pre-pivot 05 "$moddir/services.sh" } diff --git a/dracut/services.sh b/dracut/services.sh new file mode 100644 index 0000000..c26ba19 --- /dev/null +++ b/dracut/services.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- +# ex: ts=8 sw=4 sts=4 et filetype=sh + +type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh + +SERVICEDIR=$NEWROOT/etc/sv/ +SERVICES="$(getarg live.services)" + +for f in ${SERVICES}; do + ln -s /etc/sv/$f $NEWROOT/etc/runit/runsvdir/default/ +done + +dhcpcd=1 +for f in connmand NetworkManager wicd; do + if [ -e $SERVICEDIR/$f ]; then + unset dhcpcd + fi +done + +# Enable all services by default... with some exceptions. +for f in $SERVICEDIR/*; do + _service=${f##*/} + case "${_service}" in + agetty-console|sulogin|dhcpcd-*) ;; # ignored + dhcpcd) [ -n "$dhcpcd" ] && ln -sf ${f##$NEWROOT} $NEWROOT/etc/runit/runsvdir/default/;; + *) ln -sf ${f##$NEWROOT} $NEWROOT/etc/runit/runsvdir/default/;; + esac +done -- cgit 1.4.1 From 32e9d6e04a4298955283c49a5eb9bba823328dc6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 2 Dec 2014 21:19:12 +0100 Subject: dracut/services: do not auto enable ip{,6}tables. --- dracut/services.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dracut') diff --git a/dracut/services.sh b/dracut/services.sh index c26ba19..8ebe8c7 100644 --- a/dracut/services.sh +++ b/dracut/services.sh @@ -22,7 +22,7 @@ done for f in $SERVICEDIR/*; do _service=${f##*/} case "${_service}" in - agetty-console|sulogin|dhcpcd-*) ;; # ignored + agetty-console|sulogin|dhcpcd-*|iptables|ip6tables) ;; # ignored dhcpcd) [ -n "$dhcpcd" ] && ln -sf ${f##$NEWROOT} $NEWROOT/etc/runit/runsvdir/default/;; *) ln -sf ${f##$NEWROOT} $NEWROOT/etc/runit/runsvdir/default/;; esac -- cgit 1.4.1 From ef1c3e67661a055704baa413f515aaeb5e8beea2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Dec 2014 09:15:43 +0100 Subject: dracut/display-manager-autologin: start xfce4 if startxfce4 exists. --- dracut/display-manager-autologin.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'dracut') diff --git a/dracut/display-manager-autologin.sh b/dracut/display-manager-autologin.sh index c667e21..9fc99fd 100644 --- a/dracut/display-manager-autologin.sh +++ b/dracut/display-manager-autologin.sh @@ -34,5 +34,7 @@ if [ -r ${NEWROOT}/etc/lxdm/lxdm.conf ]; then sed -e "s,.*autologin.*=.*,autologin=$USERNAME," -i ${NEWROOT}/etc/lxdm/lxdm.conf if [ -x ${NEWROOT}/usr/bin/enlightenment_start ]; then sed -e "s,.*session.*=.*,session=/usr/bin/enlightenment_start," -i ${NEWROOT}/etc/lxdm/lxdm.conf + elif [ -x ${NEWROOT}/usr/bin/startxfce4 ]; then + sed -e "s,.*session.*=.*,session=/usr/bin/startxfce4," -i ${NEWROOT}/etc/lxdm/lxdm.conf fi fi -- cgit 1.4.1 From ee37a611e923425569dba70d0b91345a0ba64424 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 3 Dec 2014 11:29:43 +0100 Subject: dracut/display-manager-autologin: autostart mate via lxdm if mate-session exists. --- dracut/display-manager-autologin.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'dracut') diff --git a/dracut/display-manager-autologin.sh b/dracut/display-manager-autologin.sh index 9fc99fd..d497188 100644 --- a/dracut/display-manager-autologin.sh +++ b/dracut/display-manager-autologin.sh @@ -36,5 +36,7 @@ if [ -r ${NEWROOT}/etc/lxdm/lxdm.conf ]; then sed -e "s,.*session.*=.*,session=/usr/bin/enlightenment_start," -i ${NEWROOT}/etc/lxdm/lxdm.conf elif [ -x ${NEWROOT}/usr/bin/startxfce4 ]; then sed -e "s,.*session.*=.*,session=/usr/bin/startxfce4," -i ${NEWROOT}/etc/lxdm/lxdm.conf + elif [ -x ${NEWROOT}/usr/bin/mate-session ]; then + sed -e "s,.*session.*=.*,session=/usr/bin/mate-session," -i ${NEWROOT}/etc/lxdm/lxdm.conf fi fi -- cgit 1.4.1 From bfd7188589052c318ad002c465073fd80838c454 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 4 Dec 2014 10:08:13 +0100 Subject: dracut/service: do not enable agetty-generic; misc tweaks. --- dracut/services.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dracut') diff --git a/dracut/services.sh b/dracut/services.sh index 8ebe8c7..9f9df65 100644 --- a/dracut/services.sh +++ b/dracut/services.sh @@ -4,11 +4,11 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh -SERVICEDIR=$NEWROOT/etc/sv/ +SERVICEDIR=$NEWROOT/etc/sv SERVICES="$(getarg live.services)" for f in ${SERVICES}; do - ln -s /etc/sv/$f $NEWROOT/etc/runit/runsvdir/default/ + ln -sf /etc/sv/$f $NEWROOT/etc/runit/runsvdir/default/ done dhcpcd=1 @@ -22,7 +22,7 @@ done for f in $SERVICEDIR/*; do _service=${f##*/} case "${_service}" in - agetty-console|sulogin|dhcpcd-*|iptables|ip6tables) ;; # ignored + agetty-console|agetty-generic|sulogin|dhcpcd-*|iptables|ip6tables) ;; # ignored dhcpcd) [ -n "$dhcpcd" ] && ln -sf ${f##$NEWROOT} $NEWROOT/etc/runit/runsvdir/default/;; *) ln -sf ${f##$NEWROOT} $NEWROOT/etc/runit/runsvdir/default/;; esac -- cgit 1.4.1 From 289136e02ee20247fbb2b6a1a8d07c331e86fd1a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 25 Jan 2015 08:38:18 +0100 Subject: dracut/services: do not enable agetty-serial. --- dracut/services.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dracut') diff --git a/dracut/services.sh b/dracut/services.sh index 9f9df65..bf6c55c 100644 --- a/dracut/services.sh +++ b/dracut/services.sh @@ -22,7 +22,7 @@ done for f in $SERVICEDIR/*; do _service=${f##*/} case "${_service}" in - agetty-console|agetty-generic|sulogin|dhcpcd-*|iptables|ip6tables) ;; # ignored + agetty-console|agetty-generic|agetty-serial|sulogin|dhcpcd-*|iptables|ip6tables) ;; # ignored dhcpcd) [ -n "$dhcpcd" ] && ln -sf ${f##$NEWROOT} $NEWROOT/etc/runit/runsvdir/default/;; *) ln -sf ${f##$NEWROOT} $NEWROOT/etc/runit/runsvdir/default/;; esac -- cgit 1.4.1 From 8de43b1f994f82ce5bb104d85d328a03ee08b052 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 25 Jan 2015 08:38:38 +0100 Subject: dracut/display-manager-autologin: autostart cinnamon if found. --- dracut/display-manager-autologin.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'dracut') diff --git a/dracut/display-manager-autologin.sh b/dracut/display-manager-autologin.sh index d497188..f294d9b 100644 --- a/dracut/display-manager-autologin.sh +++ b/dracut/display-manager-autologin.sh @@ -38,5 +38,7 @@ if [ -r ${NEWROOT}/etc/lxdm/lxdm.conf ]; then sed -e "s,.*session.*=.*,session=/usr/bin/startxfce4," -i ${NEWROOT}/etc/lxdm/lxdm.conf elif [ -x ${NEWROOT}/usr/bin/mate-session ]; then sed -e "s,.*session.*=.*,session=/usr/bin/mate-session," -i ${NEWROOT}/etc/lxdm/lxdm.conf + elif [ -x ${NEWROOT}/usr/bin/cinnamon-session ]; then + sed -e "s,.*session.*=.*,session=/usr/bin/cinnamon-session," -i ${NEWROOT}/etc/lxdm/lxdm.conf fi fi -- cgit 1.4.1 From 45ea7a94e3ec6d0ad2f94f5c08fa1a705fe89be6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 14 Feb 2015 11:40:57 +0100 Subject: dracut/services: do not enable agetty on serial by default. --- dracut/services.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dracut') diff --git a/dracut/services.sh b/dracut/services.sh index bf6c55c..f0f1eef 100644 --- a/dracut/services.sh +++ b/dracut/services.sh @@ -22,7 +22,7 @@ done for f in $SERVICEDIR/*; do _service=${f##*/} case "${_service}" in - agetty-console|agetty-generic|agetty-serial|sulogin|dhcpcd-*|iptables|ip6tables) ;; # ignored + agetty-console|agetty-generic|agetty-serial|agetty-tty[SAU]*|sulogin|dhcpcd-*|iptables|ip6tables) ;; # ignored dhcpcd) [ -n "$dhcpcd" ] && ln -sf ${f##$NEWROOT} $NEWROOT/etc/runit/runsvdir/default/;; *) ln -sf ${f##$NEWROOT} $NEWROOT/etc/runit/runsvdir/default/;; esac -- cgit 1.4.1 From ca8d1ff70bbd4ffbb3538c919e17642927f571b4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 14 Feb 2015 12:44:10 +0100 Subject: dracut/adduser: add user to the audio/video groups. --- dracut/adduser.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dracut') diff --git a/dracut/adduser.sh b/dracut/adduser.sh index 68b6bd4..f006424 100644 --- a/dracut/adduser.sh +++ b/dracut/adduser.sh @@ -23,7 +23,7 @@ if ! grep -q ${USERSHELL} ${NEWROOT}/etc/shells ; then fi # Create new user and remove password. We'll use autologin by default. -chroot ${NEWROOT} useradd -m -c $USERNAME -G wheel -s $USERSHELL $USERNAME +chroot ${NEWROOT} useradd -m -c $USERNAME -G audio,video,wheel -s $USERSHELL $USERNAME chroot ${NEWROOT} passwd -d $USERNAME >/dev/null 2>&1 # Setup default root/user password (voidlinux). -- cgit 1.4.1 From f0592dcd5e78dbffa8d853043a5d122a792310b5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 7 Apr 2015 10:23:33 +0200 Subject: dracut/services: do not enable wpa_supplicant. --- dracut/services.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dracut') diff --git a/dracut/services.sh b/dracut/services.sh index f0f1eef..c5276b6 100644 --- a/dracut/services.sh +++ b/dracut/services.sh @@ -22,7 +22,7 @@ done for f in $SERVICEDIR/*; do _service=${f##*/} case "${_service}" in - agetty-console|agetty-generic|agetty-serial|agetty-tty[SAU]*|sulogin|dhcpcd-*|iptables|ip6tables) ;; # ignored + agetty-console|agetty-generic|agetty-serial|agetty-tty[SAU]*|sulogin|dhcpcd-*|iptables|ip6tables|wpa_supplicant) ;; # ignored dhcpcd) [ -n "$dhcpcd" ] && ln -sf ${f##$NEWROOT} $NEWROOT/etc/runit/runsvdir/default/;; *) ln -sf ${f##$NEWROOT} $NEWROOT/etc/runit/runsvdir/default/;; esac -- cgit 1.4.1 From 1c6321d1da4ff4c274803221eb0c2c217c0892ef Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 29 Apr 2015 17:17:48 +0200 Subject: dracut/services: do not enable the pulseaudio service. --- dracut/services.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dracut') diff --git a/dracut/services.sh b/dracut/services.sh index c5276b6..d761416 100644 --- a/dracut/services.sh +++ b/dracut/services.sh @@ -22,7 +22,7 @@ done for f in $SERVICEDIR/*; do _service=${f##*/} case "${_service}" in - agetty-console|agetty-generic|agetty-serial|agetty-tty[SAU]*|sulogin|dhcpcd-*|iptables|ip6tables|wpa_supplicant) ;; # ignored + agetty-console|agetty-generic|agetty-serial|agetty-tty[SAU]*|sulogin|dhcpcd-*|iptables|ip6tables|wpa_supplicant|pulseaudio) ;; # ignored dhcpcd) [ -n "$dhcpcd" ] && ln -sf ${f##$NEWROOT} $NEWROOT/etc/runit/runsvdir/default/;; *) ln -sf ${f##$NEWROOT} $NEWROOT/etc/runit/runsvdir/default/;; esac -- cgit 1.4.1 From 929175a025254315fd0773d1af23943233616db8 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Sat, 2 May 2015 01:01:17 +0200 Subject: Support for MEMDISK The .iso can now be booted using Grub (memdisk from Syslinux package): linux16 /memdisk initrd16 /path/to/iso As well as from Syslinux: LINUX memdisk INITRD path/to/iso --- dracut/59-mtd.rules | 8 ++++++++ dracut/61-mtd.rules | 20 ++++++++++++++++++++ dracut/module-setup.sh | 7 +++++++ dracut/mtd.sh | 7 +++++++ mklive.sh.in | 2 +- 5 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 dracut/59-mtd.rules create mode 100644 dracut/61-mtd.rules create mode 100755 dracut/mtd.sh (limited to 'dracut') diff --git a/dracut/59-mtd.rules b/dracut/59-mtd.rules new file mode 100644 index 0000000..d81a6ad --- /dev/null +++ b/dracut/59-mtd.rules @@ -0,0 +1,8 @@ +SUBSYSTEM!="block", GOTO="ps_end" +ACTION!="add|change", GOTO="ps_end" +# Also don't process disks that are slated to be a multipath device +ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="ps_end" + +KERNEL=="mtdblock[0-9]*", IMPORT BLKID + +LABEL="ps_end" diff --git a/dracut/61-mtd.rules b/dracut/61-mtd.rules new file mode 100644 index 0000000..0711d3a --- /dev/null +++ b/dracut/61-mtd.rules @@ -0,0 +1,20 @@ +SUBSYSTEM!="block", GOTO="pss_end" +ACTION!="add|change", GOTO="pss_end" +# Also don't process disks that are slated to be a multipath device +ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="pss_end" + +ACTION=="change", KERNEL=="dm-[0-9]*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}!="1", GOTO="do_pss" +KERNEL=="mtdblock*", GOTO="do_pss" + +GOTO="pss_end" + +LABEL="do_pss" +# by-path (parent device path) +ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="", DEVPATH!="*/virtual/*", IMPORT PATH_ID +ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}" +ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n" + +# by-label/by-uuid links (filesystem metadata) +ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" +ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" +LABEL="pss_end" diff --git a/dracut/module-setup.sh b/dracut/module-setup.sh index 765f41f..c6d1661 100644 --- a/dracut/module-setup.sh +++ b/dracut/module-setup.sh @@ -14,6 +14,13 @@ install() { inst /usr/bin/chroot inst /usr/bin/chmod inst /usr/bin/sed + + inst /usr/bin/memdiskfind + instmods mtdblock phram + inst_rules "$moddir/59-mtd.rules" "$moddir/61-mtd.rules" + prepare_udev_rules 59-mtd.rules 61-mtd.rules + inst_hook pre-udev 01 "$moddir/mtd.sh" + inst_hook pre-pivot 01 "$moddir/adduser.sh" inst_hook pre-pivot 02 "$moddir/display-manager-autologin.sh" inst_hook pre-pivot 03 "$moddir/copy-initramfs.sh" diff --git a/dracut/mtd.sh b/dracut/mtd.sh new file mode 100755 index 0000000..1d94a4e --- /dev/null +++ b/dracut/mtd.sh @@ -0,0 +1,7 @@ +#!/bin/sh +MEMDISK=$(memdiskfind) +if [ "$MEMDISK" ]; then + modprobe phram phram=memdisk,$MEMDISK + modprobe mtdblock + printf 'KERNEL=="mtdblock0", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root /dev/mtdblock0"\n' >> /etc/udev/rules.d/99-live-squash.rules +fi diff --git a/mklive.sh.in b/mklive.sh.in index 60e9248..9523c0c 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -82,7 +82,7 @@ copy_void_conf() { copy_dracut_files() { mkdir -p $1/usr/lib/dracut/modules.d/01vmklive - cp dracut/*.sh $1/usr/lib/dracut/modules.d/01vmklive/ + cp dracut/* $1/usr/lib/dracut/modules.d/01vmklive/ } install_prereqs() { -- cgit 1.4.1 From 0493378c0c2120979987b2ee64c5c5eb34a6fc7f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 8 May 2015 17:55:36 +0200 Subject: dracut: only install memdisk stuff if /usr/bin/memdiskfind exists. --- dracut/module-setup.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'dracut') diff --git a/dracut/module-setup.sh b/dracut/module-setup.sh index c6d1661..df148f5 100644 --- a/dracut/module-setup.sh +++ b/dracut/module-setup.sh @@ -15,11 +15,13 @@ install() { inst /usr/bin/chmod inst /usr/bin/sed - inst /usr/bin/memdiskfind - instmods mtdblock phram - inst_rules "$moddir/59-mtd.rules" "$moddir/61-mtd.rules" - prepare_udev_rules 59-mtd.rules 61-mtd.rules - inst_hook pre-udev 01 "$moddir/mtd.sh" + if [ -e /usr/bin/memdiskfind ]; then + inst /usr/bin/memdiskfind + instmods mtdblock phram + inst_rules "$moddir/59-mtd.rules" "$moddir/61-mtd.rules" + prepare_udev_rules 59-mtd.rules 61-mtd.rules + inst_hook pre-udev 01 "$moddir/mtd.sh" + fi inst_hook pre-pivot 01 "$moddir/adduser.sh" inst_hook pre-pivot 02 "$moddir/display-manager-autologin.sh" -- cgit 1.4.1 From 5962f489e0484a4991a9066bc19680811baa406a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 24 May 2015 07:36:42 +0200 Subject: dracut/display-manager-autologin.sh: enable kdm autologin. --- dracut/display-manager-autologin.sh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'dracut') diff --git a/dracut/display-manager-autologin.sh b/dracut/display-manager-autologin.sh index f294d9b..9357c9d 100644 --- a/dracut/display-manager-autologin.sh +++ b/dracut/display-manager-autologin.sh @@ -21,6 +21,12 @@ if [ -d ${NEWROOT}/etc/gdm ]; then fi fi +# Configure KDM autologin +if [ -e ${NEWROOT}/etc/kdm/kdmrc ]; then + sed -i -e "s|^\#\(AutoLoginEnable=\).*|\1|" ${NEWROOT}/etc/kdm/kdmrc + sed -i -e "s|^\#\(AutoLoginUser=\).*|\1$USERNAME|" ${NEWROOT}/etc/kdm/kdmrc +fi + # Configure lightdm autologin. if [ -r ${NEWROOT}/etc/lightdm.conf ]; then sed -i -e "s|^\#\(default-user=\).*|\1$USERNAME|" \ -- cgit 1.4.1 From b1e2685aef3e3b4656faf76fe9ba07f22239fee3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 25 May 2015 09:22:27 +0200 Subject: dracut/display-manager-autologin: autologin to i3 if found. --- dracut/display-manager-autologin.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'dracut') diff --git a/dracut/display-manager-autologin.sh b/dracut/display-manager-autologin.sh index 9357c9d..80bc0d5 100644 --- a/dracut/display-manager-autologin.sh +++ b/dracut/display-manager-autologin.sh @@ -46,5 +46,7 @@ if [ -r ${NEWROOT}/etc/lxdm/lxdm.conf ]; then sed -e "s,.*session.*=.*,session=/usr/bin/mate-session," -i ${NEWROOT}/etc/lxdm/lxdm.conf elif [ -x ${NEWROOT}/usr/bin/cinnamon-session ]; then sed -e "s,.*session.*=.*,session=/usr/bin/cinnamon-session," -i ${NEWROOT}/etc/lxdm/lxdm.conf + elif [ -x ${NEWROOT}/usr/bin/i3 ]; then + sed -e "s,.*session.*=.*,session=/usr/bin/i3," -i ${NEWROOT}/etc/lxdm/lxdm.conf fi fi -- cgit 1.4.1 From c4ca2a33fae3a69f9658d535bc0c3807dfa9fd83 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 29 May 2015 17:00:50 +0200 Subject: dracut/display-manager-autologin: autologin to lxde if found via lxdm. --- dracut/display-manager-autologin.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'dracut') diff --git a/dracut/display-manager-autologin.sh b/dracut/display-manager-autologin.sh index 80bc0d5..f593b60 100644 --- a/dracut/display-manager-autologin.sh +++ b/dracut/display-manager-autologin.sh @@ -48,5 +48,7 @@ if [ -r ${NEWROOT}/etc/lxdm/lxdm.conf ]; then sed -e "s,.*session.*=.*,session=/usr/bin/cinnamon-session," -i ${NEWROOT}/etc/lxdm/lxdm.conf elif [ -x ${NEWROOT}/usr/bin/i3 ]; then sed -e "s,.*session.*=.*,session=/usr/bin/i3," -i ${NEWROOT}/etc/lxdm/lxdm.conf + elif [ -x ${NEWROOT}/usr/bin/startlxde ]; then + sed -e "s,.*session.*=.*,session=/usr/bin/startlxde," -i ${NEWROOT}/etc/lxdm/lxdm.conf fi fi -- cgit 1.4.1 From eddedc275d699a7e759e14f899d6c8bc77a11556 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 30 Jul 2015 07:41:47 +0200 Subject: dracut/dm-autologin: autostart lxqt if available. --- dracut/display-manager-autologin.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'dracut') diff --git a/dracut/display-manager-autologin.sh b/dracut/display-manager-autologin.sh index f593b60..4d41164 100644 --- a/dracut/display-manager-autologin.sh +++ b/dracut/display-manager-autologin.sh @@ -50,5 +50,7 @@ if [ -r ${NEWROOT}/etc/lxdm/lxdm.conf ]; then sed -e "s,.*session.*=.*,session=/usr/bin/i3," -i ${NEWROOT}/etc/lxdm/lxdm.conf elif [ -x ${NEWROOT}/usr/bin/startlxde ]; then sed -e "s,.*session.*=.*,session=/usr/bin/startlxde," -i ${NEWROOT}/etc/lxdm/lxdm.conf + elif [ -x ${NEWROOT}/usr/bin/startlxqt ]; then + sed -e "s,.*session.*=.*,session=/usr/bin/startlxqt," -i ${NEWROOT}/etc/lxdm/lxdm.conf fi fi -- cgit 1.4.1 From cb2510b3791091fb54681cee451eb7ec24e0b266 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 9 Oct 2015 09:05:24 +0200 Subject: dracut/services: don't autostart dmeventd, lvmetad and mdadm. --- dracut/services.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dracut') diff --git a/dracut/services.sh b/dracut/services.sh index d761416..50461ff 100644 --- a/dracut/services.sh +++ b/dracut/services.sh @@ -22,7 +22,7 @@ done for f in $SERVICEDIR/*; do _service=${f##*/} case "${_service}" in - agetty-console|agetty-generic|agetty-serial|agetty-tty[SAU]*|sulogin|dhcpcd-*|iptables|ip6tables|wpa_supplicant|pulseaudio) ;; # ignored + agetty-console|agetty-generic|agetty-serial|agetty-tty[SAU]*|sulogin|dhcpcd-*|iptables|ip6tables|wpa_supplicant|pulseaudio|lvmetad|dmeventd|mdadm) ;; # ignored dhcpcd) [ -n "$dhcpcd" ] && ln -sf ${f##$NEWROOT} $NEWROOT/etc/runit/runsvdir/default/;; *) ln -sf ${f##$NEWROOT} $NEWROOT/etc/runit/runsvdir/default/;; esac -- cgit 1.4.1