move all file removal cleanups to "cleanup" hook

master
Harald Hoyer 2012-02-07 19:23:22 +01:00
parent 59feafc6c7
commit 56ac6c7e76
7 changed files with 8 additions and 6 deletions

View File

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


[[ $hookdirs ]] || { [[ $hookdirs ]] || {
hookdirs="cmdline pre-udev pre-trigger netroot initqueue pre-mount" 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 export hookdirs
} }



View File

@ -87,7 +87,7 @@ install() {
inst ${moddir}/console_init /lib/udev/console_init inst ${moddir}/console_init /lib/udev/console_init
inst_rules ${moddir}/10-console.rules inst_rules ${moddir}/10-console.rules
inst_hook cmdline 20 "${moddir}/parse-i18n.sh" 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() { install_all_kbd() {

View File

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


inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.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_hook emergency 50 "$moddir"/plymouth-emergency.sh
inst readlink inst readlink
} }

View File

@ -75,7 +75,7 @@ install() {
inst_simple "$i" inst_simple "$i"
done done
inst_hook cmdline 01 "$moddir/parse-kernel.sh" 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 inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh


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

View File

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


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



View File

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

View File

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


source_hook cleanup

unset PS4 unset PS4


CAPSH=$(command -v capsh) CAPSH=$(command -v capsh)