From: Stefan Schantl Date: Sun, 23 Aug 2009 19:23:16 +0000 (+0200) Subject: Added reboot flag to various upstart jobs. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44fbd85f2ee87620ca4036e95843488aa4e6d62b;p=ipfire-3.x.git Added reboot flag to various upstart jobs. --- diff --git a/src/initscripts/core/control-alt-delete.conf b/src/initscripts/core/control-alt-delete.conf index 2f72b55da..318189457 100644 --- a/src/initscripts/core/control-alt-delete.conf +++ b/src/initscripts/core/control-alt-delete.conf @@ -3,5 +3,4 @@ author "IPFire Team" start on control-alt-delete -task exec initctl emit --no-wait reboot diff --git a/src/initscripts/core/reboot.conf b/src/initscripts/core/reboot.conf deleted file mode 100644 index e7a287437..000000000 --- a/src/initscripts/core/reboot.conf +++ /dev/null @@ -1,13 +0,0 @@ -description "Reboot the system" -author "IPFire Team" - -start on reboot - -console output - -task -exec initctl emit --no-wait shutdown - -post-stop script - reboot -d -f -i -end script diff --git a/src/initscripts/core/tty1.conf b/src/initscripts/core/tty1.conf index 89824290a..cd53c5197 100644 --- a/src/initscripts/core/tty1.conf +++ b/src/initscripts/core/tty1.conf @@ -2,7 +2,7 @@ description "Start a tty" author "IPFire Team" start on stopped mountfs -stop on shutdown +stop on shutdown or reboot respawn exec /sbin/agetty 9600 tty1 diff --git a/src/initscripts/core/tty2.conf b/src/initscripts/core/tty2.conf index 376062e67..ef4a54e99 100644 --- a/src/initscripts/core/tty2.conf +++ b/src/initscripts/core/tty2.conf @@ -2,7 +2,7 @@ description "Start a tty" author "IPFire Team" start on stopped mountfs -stop on shutdown +stop on shutdown or reboot respawn exec /sbin/agetty 9600 tty2 diff --git a/src/initscripts/core/tty3.conf b/src/initscripts/core/tty3.conf index b30af3e84..168fbfd50 100644 --- a/src/initscripts/core/tty3.conf +++ b/src/initscripts/core/tty3.conf @@ -2,7 +2,7 @@ description "Start a tty" author "IPFire Team" start on stopped mountfs -stop on shutdown +stop on shutdown or reboot respawn exec /sbin/agetty 9600 tty3 diff --git a/src/initscripts/core/tty4.conf b/src/initscripts/core/tty4.conf index 2ee07cec2..85abbc772 100644 --- a/src/initscripts/core/tty4.conf +++ b/src/initscripts/core/tty4.conf @@ -2,7 +2,7 @@ description "Start a tty" author "IPFire Team" start on stopped mountfs -stop on shutdown +stop on shutdown or reboot respawn exec /sbin/agetty 9600 tty4 diff --git a/src/initscripts/core/udev.conf b/src/initscripts/core/udev.conf index f2ab45ef6..f1981225c 100644 --- a/src/initscripts/core/udev.conf +++ b/src/initscripts/core/udev.conf @@ -2,6 +2,7 @@ description "Start Udev Daemon" author "IPFire Team" start on stopped mount-kernel-filesystems +stop on shutdown or reboot emits block-device-added block-device-removed emits network-device-added network-device-removed diff --git a/src/initscripts/extras/fcron.conf b/src/initscripts/extras/fcron.conf index e9dcab8f0..13a0711ec 100644 --- a/src/initscripts/extras/fcron.conf +++ b/src/initscripts/extras/fcron.conf @@ -2,7 +2,7 @@ description "Start the cron daemon" author "IPFire Team" start on stopped mountfs -stop on shutdown +stop on shutdown or reboot exec /usr/sbin/fcron -y -b expect fork diff --git a/src/initscripts/extras/messagebus.conf b/src/initscripts/extras/messagebus.conf index c559c70dc..de2c02fa4 100644 --- a/src/initscripts/extras/messagebus.conf +++ b/src/initscripts/extras/messagebus.conf @@ -2,7 +2,7 @@ description "Starts the message bus daemon" author "IPFire Team" start on stopped mountfs -stop on shutdown +stop on shutdown or reboot exec /usr/bin/dbus-daemon --config-file=/etc/dbus-1/system.conf --nofork respawn diff --git a/src/initscripts/extras/network.conf b/src/initscripts/extras/network.conf index c6f3d4f51..4d4e3298f 100644 --- a/src/initscripts/extras/network.conf +++ b/src/initscripts/extras/network.conf @@ -2,7 +2,7 @@ description "Control the networking" author "IPFire Team" start on stopped mountfs -stop on shutdown +stop on shutdown or reboot pre-start script network start diff --git a/src/initscripts/extras/openldap.conf b/src/initscripts/extras/openldap.conf index d65b6d3c7..ebe5e437b 100644 --- a/src/initscripts/extras/openldap.conf +++ b/src/initscripts/extras/openldap.conf @@ -2,7 +2,7 @@ description "Starts OpenLDAP slapd daemon" author "IPFire Team" start on started mountfs -stop on shutdown +stop on shutdown or reboot exec /usr/sbin/slapd expect fork diff --git a/src/initscripts/extras/syslog-ng.conf b/src/initscripts/extras/syslog-ng.conf index 9c4279e9f..04eef9e49 100644 --- a/src/initscripts/extras/syslog-ng.conf +++ b/src/initscripts/extras/syslog-ng.conf @@ -2,7 +2,7 @@ description "Start system log daemon" author "IPFire Team" start on stopped mountfs -stop on shutdown +stop on shutdown or reboot exec /sbin/syslog-ng -F respawn diff --git a/src/rootfiles/core/glibc b/src/rootfiles/core/glibc index 31a4d2331..fe85f6e3a 100644 --- a/src/rootfiles/core/glibc +++ b/src/rootfiles/core/glibc @@ -1,5 +1,4 @@ etc/ld.so.cache -etc/ld.so.conf etc/localtime etc/nsswitch.conf #etc/rpc diff --git a/src/rootfiles/core/initscripts b/src/rootfiles/core/initscripts index b747ea8ba..6c2b35c6e 100644 --- a/src/rootfiles/core/initscripts +++ b/src/rootfiles/core/initscripts @@ -5,7 +5,6 @@ etc/init/load-modules.conf etc/init/loopback.conf etc/init/mount-kernel-filesystems.conf etc/init/mountfs.conf -etc/init/reboot.conf etc/init/shutdown.conf etc/init/swap.conf etc/init/sysctl.conf diff --git a/src/rootfiles/core/syslinux b/src/rootfiles/core/syslinux index 6a291143f..1b5b2b7b2 100644 --- a/src/rootfiles/core/syslinux +++ b/src/rootfiles/core/syslinux @@ -1,4 +1,3 @@ -#sbin/extlinux #usr/bin/gethostip #usr/bin/isohybrid #usr/bin/keytab-lilo @@ -7,162 +6,6 @@ #usr/bin/mkdiskimage #usr/bin/ppmtolss16 #usr/bin/sha1pass -#usr/bin/syslinux #usr/bin/syslinux2ansi -#usr/share/man/man1/extlinux.1 -#usr/share/man/man1/gethostip.1 -#usr/share/man/man1/lss16toppm.1 -#usr/share/man/man1/ppmtolss16.1 -#usr/share/man/man1/syslinux.1 -#usr/share/man/man1/syslinux2ansi.1 -#usr/share/syslinux -#usr/share/syslinux/altmbr.bin -#usr/share/syslinux/altmbr_c.bin -#usr/share/syslinux/altmbr_f.bin -#usr/share/syslinux/chain.c32 -#usr/share/syslinux/cmd.c32 -#usr/share/syslinux/com32 -#usr/share/syslinux/com32/com32.ld -#usr/share/syslinux/com32/include -#usr/share/syslinux/com32/include/alloca.h -#usr/share/syslinux/com32/include/assert.h -#usr/share/syslinux/com32/include/bitsize -#usr/share/syslinux/com32/include/bitsize/limits.h -#usr/share/syslinux/com32/include/bitsize/stddef.h -#usr/share/syslinux/com32/include/bitsize/stdint.h -#usr/share/syslinux/com32/include/bitsize/stdintconst.h -#usr/share/syslinux/com32/include/bitsize/stdintlimits.h -#usr/share/syslinux/com32/include/colortbl.h -#usr/share/syslinux/com32/include/com32.h -#usr/share/syslinux/com32/include/console.h -#usr/share/syslinux/com32/include/cpufeature.h -#usr/share/syslinux/com32/include/ctype.h -#usr/share/syslinux/com32/include/dev.h -#usr/share/syslinux/com32/include/dirent.h -#usr/share/syslinux/com32/include/elf.h -#usr/share/syslinux/com32/include/endian.h -#usr/share/syslinux/com32/include/errno.h -#usr/share/syslinux/com32/include/fcntl.h -#usr/share/syslinux/com32/include/gplinclude -#usr/share/syslinux/com32/include/gplinclude/README -#usr/share/syslinux/com32/include/gplinclude/cpuid.h -#usr/share/syslinux/com32/include/gplinclude/dmi -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi.h -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_base_board.h -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_battery.h -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_bios.h -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_chassis.h -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_ipmi.h -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_memory.h -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_processor.h -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_system.h -#usr/share/syslinux/com32/include/gplinclude/vpd -#usr/share/syslinux/com32/include/gplinclude/vpd/vpd.h -#usr/share/syslinux/com32/include/inttypes.h -#usr/share/syslinux/com32/include/klibc -#usr/share/syslinux/com32/include/klibc/archsetjmp.h -#usr/share/syslinux/com32/include/klibc/compiler.h -#usr/share/syslinux/com32/include/klibc/diverr.h -#usr/share/syslinux/com32/include/klibc/endian.h -#usr/share/syslinux/com32/include/klibc/extern.h -#usr/share/syslinux/com32/include/klibc/sysconfig.h -#usr/share/syslinux/com32/include/limits.h -#usr/share/syslinux/com32/include/math.h -#usr/share/syslinux/com32/include/minmax.h -#usr/share/syslinux/com32/include/netinet -#usr/share/syslinux/com32/include/netinet/in.h -#usr/share/syslinux/com32/include/png.h -#usr/share/syslinux/com32/include/pngconf.h -#usr/share/syslinux/com32/include/setjmp.h -#usr/share/syslinux/com32/include/stdarg.h -#usr/share/syslinux/com32/include/stdbool.h -#usr/share/syslinux/com32/include/stddef.h -#usr/share/syslinux/com32/include/stdint.h -#usr/share/syslinux/com32/include/stdio.h -#usr/share/syslinux/com32/include/stdlib.h -#usr/share/syslinux/com32/include/string.h -#usr/share/syslinux/com32/include/sys -#usr/share/syslinux/com32/include/sys/cpu.h -#usr/share/syslinux/com32/include/sys/elf32.h -#usr/share/syslinux/com32/include/sys/elf64.h -#usr/share/syslinux/com32/include/sys/elfcommon.h -#usr/share/syslinux/com32/include/sys/fpu.h -#usr/share/syslinux/com32/include/sys/io.h -#usr/share/syslinux/com32/include/sys/pci.h -#usr/share/syslinux/com32/include/sys/stat.h -#usr/share/syslinux/com32/include/sys/time.h -#usr/share/syslinux/com32/include/sys/times.h -#usr/share/syslinux/com32/include/sys/types.h -#usr/share/syslinux/com32/include/syslinux -#usr/share/syslinux/com32/include/syslinux/adv.h -#usr/share/syslinux/com32/include/syslinux/advconst.h -#usr/share/syslinux/com32/include/syslinux/align.h -#usr/share/syslinux/com32/include/syslinux/boot.h -#usr/share/syslinux/com32/include/syslinux/bootpm.h -#usr/share/syslinux/com32/include/syslinux/bootrm.h -#usr/share/syslinux/com32/include/syslinux/config.h -#usr/share/syslinux/com32/include/syslinux/features.h -#usr/share/syslinux/com32/include/syslinux/idle.h -#usr/share/syslinux/com32/include/syslinux/io.h -#usr/share/syslinux/com32/include/syslinux/keyboard.h -#usr/share/syslinux/com32/include/syslinux/linux.h -#usr/share/syslinux/com32/include/syslinux/loadfile.h -#usr/share/syslinux/com32/include/syslinux/memscan.h -#usr/share/syslinux/com32/include/syslinux/movebits.h -#usr/share/syslinux/com32/include/syslinux/pxe.h -#usr/share/syslinux/com32/include/syslinux/reboot.h -#usr/share/syslinux/com32/include/syslinux/resolve.h -#usr/share/syslinux/com32/include/syslinux/vesacon.h -#usr/share/syslinux/com32/include/syslinux/video.h -#usr/share/syslinux/com32/include/syslinux/zio.h -#usr/share/syslinux/com32/include/time.h -#usr/share/syslinux/com32/include/tinyjpeg.h -#usr/share/syslinux/com32/include/unistd.h -#usr/share/syslinux/com32/include/zconf.h -#usr/share/syslinux/com32/include/zlib.h -#usr/share/syslinux/com32/libcom32.a -#usr/share/syslinux/com32/libcom32gpl.a #usr/share/syslinux/com32/libutil_com.a #usr/share/syslinux/com32/libutil_lnx.a -#usr/share/syslinux/config.c32 -#usr/share/syslinux/copybs.com -#usr/share/syslinux/cpuidtest.c32 -#usr/share/syslinux/dmitest.c32 -#usr/share/syslinux/elf.c32 -#usr/share/syslinux/ethersel.c32 -#usr/share/syslinux/gfxboot.com -#usr/share/syslinux/gptmbr.bin -#usr/share/syslinux/gptmbr_c.bin -#usr/share/syslinux/gptmbr_f.bin -#usr/share/syslinux/gpxelinux.0 -#usr/share/syslinux/hdt.c32 -#usr/share/syslinux/ifcpu64.c32 -#usr/share/syslinux/isohdpfx.bin -#usr/share/syslinux/isohdpfx_c.bin -#usr/share/syslinux/isohdpfx_f.bin -#usr/share/syslinux/isolinux-debug.bin -#usr/share/syslinux/isolinux.bin -#usr/share/syslinux/kbdmap.c32 -#usr/share/syslinux/linux.c32 -#usr/share/syslinux/mboot.c32 -#usr/share/syslinux/mbr.bin -#usr/share/syslinux/mbr_c.bin -#usr/share/syslinux/mbr_f.bin -#usr/share/syslinux/memdisk -#usr/share/syslinux/memdump.com -#usr/share/syslinux/meminfo.c32 -#usr/share/syslinux/menu.c32 -#usr/share/syslinux/pcitest.c32 -#usr/share/syslinux/pmload.c32 -#usr/share/syslinux/poweroff.com -#usr/share/syslinux/pxechain.com -#usr/share/syslinux/pxelinux.0 -#usr/share/syslinux/reboot.c32 -#usr/share/syslinux/rosh.c32 -#usr/share/syslinux/sanboot.c32 -#usr/share/syslinux/sdi.c32 -#usr/share/syslinux/syslinux.com -#usr/share/syslinux/syslinux.exe -#usr/share/syslinux/vesainfo.c32 -#usr/share/syslinux/vesamenu.c32 -#usr/share/syslinux/vpdtest.c32