Browse Source

set DRACUT_SYSTEMD for systemd mode in the initramfs

master
Harald Hoyer 13 years ago
parent
commit
aefea76cf8
  1. 2
      modules.d/10i18n/console_init.sh
  2. 2
      modules.d/10i18n/parse-i18n.sh
  3. 2
      modules.d/50plymouth/plymouth-newroot.sh
  4. 2
      modules.d/50plymouth/plymouth-pretrigger.sh
  5. 3
      modules.d/90crypt/parse-crypt.sh
  6. 3
      modules.d/98systemd/dracut-cmdline.sh
  7. 1
      modules.d/98systemd/dracut-initqueue.sh
  8. 1
      modules.d/98systemd/dracut-pre-pivot.sh
  9. 1
      modules.d/98systemd/dracut-pre-trigger.sh
  10. 2
      modules.d/98systemd/dracut-pre-udev.sh
  11. 2
      modules.d/99base/dracut-lib.sh

2
modules.d/10i18n/console_init.sh

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh

[ -x /lib/systemd/systemd ] && exit 0
[ -n "$DRACUT_SYSTEMD" ] && exit 0

if [ -x /lib/systemd/systemd-vconsole-setup ]; then
/lib/systemd/systemd-vconsole-setup "$@"

2
modules.d/10i18n/parse-i18n.sh

@ -35,7 +35,7 @@ if [ -f /etc/locale.conf ]; then @@ -35,7 +35,7 @@ if [ -f /etc/locale.conf ]; then
export LC_ALL
fi

if [ -x /lib/systemd/systemd ]; then
if [ -n "$DRACUT_SYSTEMD" ]; then
rm -f /{etc,lib}/udev/rules.d/10-console.rules
rm -f /lib/udev/console_init
fi

2
modules.d/50plymouth/plymouth-newroot.sh

@ -2,5 +2,5 @@ @@ -2,5 +2,5 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh

[ -x /bin/plymouth -a ! -x /lib/systemd/systemd ] || exit 0
[ -x /bin/plymouth -a -z "$DRACUT_SYSTEMD" ] || exit 0
/bin/plymouth --newroot=$NEWROOT

2
modules.d/50plymouth/plymouth-pretrigger.sh

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh

[ -x /bin/plymouthd -a ! -x /lib/systemd/systemd ] || exit 0
[ -x /bin/plymouthd -a ! -n "$DRACUT_SYSTEMD" ] || exit 0

if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
# first trigger graphics subsystem

3
modules.d/90crypt/parse-crypt.sh

@ -1,6 +1,9 @@ @@ -1,6 +1,9 @@
#!/bin/sh
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh

[ -n "$DRACUT_SYSTEMD" ] && exit 0

if ! getargbool 1 rd.luks -d -n rd_NO_LUKS; then
info "rd.luks=0: removing cryptoluks activation"
rm -f /etc/udev/rules.d/70-luks.rules

3
modules.d/98systemd/dracut-cmdline.sh

@ -2,7 +2,8 @@ @@ -2,7 +2,8 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh

NEWROOT="/sysroot"
export DRACUT_SYSTEMD=1
export NEWROOT="/sysroot"
[ -d $NEWROOT ] || mkdir -p -m 0755 $NEWROOT
[ -d /run/initramfs ] || mkdir -p -m 0755 /run/initramfs
[ -d /run/lock ] || mkdir -p -m 0755 /run/lock

1
modules.d/98systemd/dracut-initqueue.sh

@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh

export DRACUT_SYSTEMD=1
if [ -f /dracut-state.sh ]; then
. /dracut-state.sh 2>/dev/null
fi

1
modules.d/98systemd/dracut-pre-pivot.sh

@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh

export DRACUT_SYSTEMD=1
if [ -f /dracut-state.sh ]; then
. /dracut-state.sh 2>/dev/null
fi

1
modules.d/98systemd/dracut-pre-trigger.sh

@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh

export DRACUT_SYSTEMD=1
if [ -f /dracut-state.sh ]; then
. /dracut-state.sh 2>/dev/null
fi

2
modules.d/98systemd/dracut-pre-udev.sh

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
#!/bin/sh
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh

export DRACUT_SYSTEMD=1
if [ -f /dracut-state.sh ]; then
. /dracut-state.sh 2>/dev/null
fi

2
modules.d/99base/dracut-lib.sh

@ -358,7 +358,7 @@ check_quiet() { @@ -358,7 +358,7 @@ check_quiet() {
fi
}

if [ ! -x /lib/systemd/systemd ]; then
if [ -z "$DRACUT_SYSTEMD" ]; then

warn() {
check_quiet

Loading…
Cancel
Save