Browse Source

move all file removal cleanups to "cleanup" hook

master
Harald Hoyer 13 years ago
parent
commit
56ac6c7e76
  1. 2
      dracut-functions
  2. 2
      modules.d/10i18n/module-setup.sh
  3. 2
      modules.d/50plymouth/module-setup.sh
  4. 2
      modules.d/90kernel-modules/module-setup.sh
  5. 2
      modules.d/95terminfo/module-setup.sh
  6. 2
      modules.d/98syslog/module-setup.sh
  7. 2
      modules.d/99base/init

2
dracut-functions

@ -592,7 +592,7 @@ inst() { @@ -592,7 +592,7 @@ inst() {

[[ $hookdirs ]] || {
hookdirs="cmdline pre-udev pre-trigger netroot initqueue pre-mount"
hookdirs+=" pre-pivot mount emergency shutdown-emergency shutdown"
hookdirs+=" pre-pivot mount emergency shutdown-emergency shutdown cleanup"
export hookdirs
}


2
modules.d/10i18n/module-setup.sh

@ -87,7 +87,7 @@ install() { @@ -87,7 +87,7 @@ install() {
inst ${moddir}/console_init /lib/udev/console_init
inst_rules ${moddir}/10-console.rules
inst_hook cmdline 20 "${moddir}/parse-i18n.sh"
inst_hook pre-pivot 20 "${moddir}/i18n-cleanup.sh"
inst_hook cleanup 20 "${moddir}/i18n-cleanup.sh"
}

install_all_kbd() {

2
modules.d/50plymouth/module-setup.sh

@ -46,7 +46,7 @@ install() { @@ -46,7 +46,7 @@ install() {

inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh
inst_hook pre-pivot 10 "$moddir"/plymouth-cleanup.sh
inst_hook cleanup 10 "$moddir"/plymouth-cleanup.sh
inst_hook emergency 50 "$moddir"/plymouth-emergency.sh
inst readlink
}

2
modules.d/90kernel-modules/module-setup.sh

@ -75,7 +75,7 @@ install() { @@ -75,7 +75,7 @@ install() {
inst_simple "$i"
done
inst_hook cmdline 01 "$moddir/parse-kernel.sh"
inst_hook pre-pivot 20 "$moddir/kernel-cleanup.sh"
inst_hook cleanup 20 "$moddir/kernel-cleanup.sh"
inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh

for _f in modules.builtin.bin modules.builtin; do

2
modules.d/95terminfo/module-setup.sh

@ -15,6 +15,6 @@ install() { @@ -15,6 +15,6 @@ install() {
done
fi

inst_hook pre-pivot 20 "${moddir}/terminfo-cleanup.sh"
inst_hook cleanup 20 "${moddir}/terminfo-cleanup.sh"
}


2
modules.d/98syslog/module-setup.sh

@ -34,7 +34,7 @@ install() { @@ -34,7 +34,7 @@ install() {
dracut_install $_installs
inst_hook cmdline 90 "$moddir/parse-syslog-opts.sh"
inst_hook pre-udev 61 "$moddir/syslog-genrules.sh"
inst_hook pre-pivot 99 "$moddir/syslog-cleanup.sh"
inst_hook cleanup 99 "$moddir/syslog-cleanup.sh"
inst_simple "$moddir/rsyslogd-start.sh" /sbin/rsyslogd-start
inst_simple "$moddir/rsyslogd-stop.sh" /sbin/rsyslogd-stop
mkdir -m 0755 -p ${initdir}/etc/templates

2
modules.d/99base/init

@ -422,6 +422,8 @@ wait_for_loginit @@ -422,6 +422,8 @@ wait_for_loginit
getarg rd.break rdbreak && emergency_shell -n switch_root "Break before switch_root"
info "Switching root"

source_hook cleanup

unset PS4

CAPSH=$(command -v capsh)

Loading…
Cancel
Save