[arch-releng] [PATCH 4/5] [configs/releng] Remove files for sysvinit and initscripts
Gerardo Exequiel Pozzi
vmlinuz386 at yahoo.com.ar
Wed Sep 12 03:10:44 EDT 2012
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
---
configs/releng/root-image/etc/archiso/functions | 20 ---------
configs/releng/root-image/etc/inittab | 48 ----------------------
configs/releng/root-image/etc/rc.conf | 23 -----------
.../etc/rc.d/functions.d/automated_script | 23 -----------
.../etc/rc.d/functions.d/setup_special_console | 25 -----------
configs/releng/root-image/etc/rc.d/pacman-init | 34 ---------------
6 files changed, 173 deletions(-)
delete mode 100644 configs/releng/root-image/etc/archiso/functions
delete mode 100644 configs/releng/root-image/etc/inittab
delete mode 100644 configs/releng/root-image/etc/rc.conf
delete mode 100644 configs/releng/root-image/etc/rc.d/functions.d/automated_script
delete mode 100644 configs/releng/root-image/etc/rc.d/functions.d/setup_special_console
delete mode 100755 configs/releng/root-image/etc/rc.d/pacman-init
diff --git a/configs/releng/root-image/etc/archiso/functions b/configs/releng/root-image/etc/archiso/functions
deleted file mode 100644
index 9fffdcb..0000000
--- a/configs/releng/root-image/etc/archiso/functions
+++ /dev/null
@@ -1,20 +0,0 @@
-# vim: set ft=sh:
-
-# kernel_cmdline <param> <default>
-# Looks for a parameter on the kernel's boot-time command line.
-#
-# returns: 0 if param was found. Also prints its value if it was a K=V param.
-# 1 if it was not. Also prints value passed as <default>
-#
-kernel_cmdline ()
-{
- for param in $(/bin/cat /proc/cmdline); do
- case "${param}" in
- $1=*) echo "${param##*=}"; return 0 ;;
- $1) return 0 ;;
- *) continue ;;
- esac
- done
- [ -n "${2}" ] && echo "${2}"
- return 1
-}
diff --git a/configs/releng/root-image/etc/inittab b/configs/releng/root-image/etc/inittab
deleted file mode 100644
index e3fe2c8..0000000
--- a/configs/releng/root-image/etc/inittab
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# /etc/inittab
-#
-
-# Runlevels:
-# 0 Halt
-# 1(S) Single-user
-# 2 Not used
-# 3 Multi-user
-# 4 Not used
-# 5 X11
-# 6 Reboot
-
-## Only one of the following two lines can be uncommented!
-# Boot to console
-id:3:initdefault:
-# Boot to X11
-#id:5:initdefault:
-
-rc::sysinit:/etc/rc.sysinit
-rs:S1:wait:/etc/rc.single
-rm:2345:wait:/etc/rc.multi
-rh:06:wait:/etc/rc.shutdown
-su:S:wait:/sbin/sulogin -p
-
-# -8 options fixes umlauts problem on login
-c1:2345:respawn:/sbin/agetty -8 -s -a root 38400 tty1 linux
-c2:2345:respawn:/sbin/agetty -8 -s 38400 tty2 linux
-c3:2345:respawn:/sbin/agetty -8 -s 38400 tty3 linux
-c4:2345:respawn:/sbin/agetty -8 -s 38400 tty4 linux
-c5:2345:respawn:/sbin/agetty -8 -s 38400 tty5 linux
-c6:2345:respawn:/sbin/agetty -8 -s 38400 tty6 linux
-
-# Serial Virtual Console for KVM and others VMs
-#s0:2345:respawn:/sbin/agetty -8 -s 9600 ttyS0 linux
-
-# Hypervisor Virtual Console for Xen and KVM
-#h0:2345:respawn:/sbin/agetty -8 -s 38400 hvc0 linux
-
-ca::ctrlaltdel:/sbin/shutdown -t3 -r now
-
-# Example lines for starting a login manager
-x:5:respawn:/usr/bin/xdm -nodaemon
-#x:5:respawn:/usr/sbin/gdm -nodaemon
-#x:5:respawn:/usr/bin/kdm -nodaemon
-#x:5:respawn:/usr/bin/slim >/dev/null 2>&1
-
-# End of file
diff --git a/configs/releng/root-image/etc/rc.conf b/configs/releng/root-image/etc/rc.conf
deleted file mode 100644
index a2e6ebf..0000000
--- a/configs/releng/root-image/etc/rc.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-. /etc/archiso/functions
-#
-# /etc/rc.conf - configuration file for initscripts
-#
-# Most of rc.conf has been replaced by various other configuration
-# files. See archlinux(7) for details.
-#
-# For more details on rc.conf see rc.conf(5).
-#
-
-DAEMONS=(syslog-ng network haveged pacman-init)
-
-# Storage
-#
-# USEDMRAID="no"
-# USELVM="no"
-
-# Network
-#
-# interface=
-# address=
-# netmask=
-# gateway=
diff --git a/configs/releng/root-image/etc/rc.d/functions.d/automated_script b/configs/releng/root-image/etc/rc.d/functions.d/automated_script
deleted file mode 100644
index f3e9018..0000000
--- a/configs/releng/root-image/etc/rc.d/functions.d/automated_script
+++ /dev/null
@@ -1,23 +0,0 @@
-automated_script ()
-{
- script="$(kernel_cmdline script)"
- if [[ -n "${script}" ]]; then
- stat_busy "Configuring $script"
- if [[ "${script}" =~ ^http:// || "${script}" =~ ^ftp:// ]]; then
- wget "${script}" -q -O /tmp/startup_script >/dev/null
- rt=$?
- else
- cp "${script}" /tmp/startup_script
- rt=$?
- fi
- if [ ${rt} -eq 0 ]; then
- chmod +x /tmp/startup_script
- echo -e '\nif [ $(tty) = "/dev/tty1" ]; then\n /tmp/startup_script\nfi\n' >> /root/.zprofile
- stat_done
- else
- stat_fail
- fi
- fi
-}
-
-add_hook multi_end automated_script
diff --git a/configs/releng/root-image/etc/rc.d/functions.d/setup_special_console b/configs/releng/root-image/etc/rc.d/functions.d/setup_special_console
deleted file mode 100644
index 7badfe3..0000000
--- a/configs/releng/root-image/etc/rc.d/functions.d/setup_special_console
+++ /dev/null
@@ -1,25 +0,0 @@
-# If an alternate console was specified on the kernel command line,
-# start agetty on it too.
-setup_special_console()
-{
- local cmdline_console
- if cmdline_console=$(kernel_cmdline console); then
- stat_busy "Starting agetty on console: ${cmdline_console}"
- local port options baud rts
- port=${cmdline_console%%,*}
- options=${cmdline_console#${port}}
- options=${options#,}
- baud=${options%%[neo]*}
- [[ ${options} == *r ]] && rts="-h"
- if ! grep -q "^${port}" /etc/securetty; then
- echo ${port} >> /etc/securetty
- fi
- if ! grep -q "^z0:" /etc/inittab; then
- echo "z0:2345:respawn:/sbin/agetty -8 -s ${rts} ${baud:-9600} ${port} linux" >> /etc/inittab
- fi
- /sbin/telinit q
- stat_done
- fi
-}
-
-add_hook sysinit_end setup_special_console
diff --git a/configs/releng/root-image/etc/rc.d/pacman-init b/configs/releng/root-image/etc/rc.d/pacman-init
deleted file mode 100755
index bbbd719..0000000
--- a/configs/releng/root-image/etc/rc.d/pacman-init
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Initializing pacman keyring"
- if { pacman-key --init && pacman-key --populate archlinux; } &>/dev/null; then
- add_daemon pacman-init
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Removing pacman keyring"
- rm -rf /etc/pacman.d/gnupg
- rm_daemon pacman-init
- stat_done
- ;;
-
- restart)
- $0 stop
- $0 start
- ;;
-
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-
-exit 0
--
1.7.12
More information about the arch-releng
mailing list