From da385eb74e5f0f1ecf04a762cae221e69c68bbc6 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Tue, 12 Jun 2012 19:38:42 -0400 Subject: rc.sysinit: look for correct root fsck marker This has been broken since its was added back in 3dbbd1e2. Signed-off-by: Dave Reisner --- rc.sysinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc.sysinit b/rc.sysinit index 906135c..71eea91 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -26,7 +26,7 @@ mountpoint -q /dev/shm || mount /dev/shm &>/dev/null || mountpoint -q /proc/sys/fs/binfmt_misc || mount /proc/sys/fs/binfmt_misc &>/dev/null || mount -t binfmt_misc binfmt /proc/sys/fs/binfmt_misc -if [[ ! -e /run/initramfs/fsck-root ]]; then +if [[ ! -e /run/initramfs/root-fsck ]]; then # remount root ro to allow for fsck later on, we remount now to # make sure nothing can open files rw on root which would block a remount findmnt / --options ro &>/dev/null || -- cgit v1.2.3 From cef9b198f20d25ba93c0d1dfc030951157c5e973 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sat, 16 Jun 2012 01:49:58 +0200 Subject: locale: make sure LANG is always set as this is used in vconsole-setup to decide if we want utf8 mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We no longer use LOCALE, so no need to set this. Reported-by: Thomas Bächler Signed-off-by: Tom Gundersen --- rc.sysinit | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rc.sysinit b/rc.sysinit index 71eea91..4ce5ae5 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -67,7 +67,8 @@ udevd_modprobe sysinit if [[ -s /etc/locale.conf ]]; then parse_envfile /etc/locale.conf "LANG" - [[ $LANG ]] && LOCALE=$LANG +elif [[ $LOCALE ]]; then + export LANG=$LOCALE fi status 'Configuring Virtual Consoles' /usr/lib/systemd/systemd-vconsole-setup -- cgit v1.2.3 From f57e6f1d0d767cebebc10075276cd02f0233655c Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sat, 16 Jun 2012 02:22:07 +0200 Subject: rc.sysinit: change ordering a bit Export LANG as early as possible. Then start the log. Then setup the console. Signed-off-by: Tom Gundersen --- rc.sysinit | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/rc.sysinit b/rc.sysinit index 4ce5ae5..a0bbaa6 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -6,6 +6,12 @@ . /etc/rc.conf . /etc/rc.d/functions +if [[ -s /etc/locale.conf ]]; then + parse_envfile /etc/locale.conf "LANG" +elif [[ $LOCALE ]]; then + export LANG=$LOCALE +fi + echo " " printhl "Arch Linux\n" printhl "${C_H2}http://www.archlinux.org" @@ -26,6 +32,11 @@ mountpoint -q /dev/shm || mount /dev/shm &>/dev/null || mountpoint -q /proc/sys/fs/binfmt_misc || mount /proc/sys/fs/binfmt_misc &>/dev/null || mount -t binfmt_misc binfmt /proc/sys/fs/binfmt_misc +# log all console messages +bootlogd -p /run/bootlogd.pid + +status 'Configuring Virtual Consoles' /usr/lib/systemd/systemd-vconsole-setup + if [[ ! -e /run/initramfs/root-fsck ]]; then # remount root ro to allow for fsck later on, we remount now to # make sure nothing can open files rw on root which would block a remount @@ -35,9 +46,6 @@ fi run_hook sysinit_start -# log all console messages -bootlogd -p /run/bootlogd.pid - HWCLOCK_PARAMS="--systz" case $HARDWARECLOCK in "") ;; @@ -65,14 +73,6 @@ fi # Start/trigger UDev, load MODULES and settle UDev udevd_modprobe sysinit -if [[ -s /etc/locale.conf ]]; then - parse_envfile /etc/locale.conf "LANG" -elif [[ $LOCALE ]]; then - export LANG=$LOCALE -fi - -status 'Configuring Virtual Consoles' /usr/lib/systemd/systemd-vconsole-setup - # bring up the loopback interface [[ -d /sys/class/net/lo ]] && status "Bringing up loopback interface" ip link set up dev lo -- cgit v1.2.3 From 9b3b01214d575f2cb9dc2009ddd203cb8ae54f35 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Fri, 22 Jun 2012 22:55:31 +0200 Subject: PKGBUILD: remove duplicate makedepends line This really does not matter very much, as this PKGBUILD file is for convenience when building from git only. However, it just tripped me up and caused me some needless head-scratching, so sort it out. Signed-off-by: Tom Gundersen --- PKGBUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 0c63e59..e7429cd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -16,7 +16,6 @@ optdepends=('net-tools: legacy networking support' 'bridge-utils: Network bridging support' 'dhcpcd: DHCP network configuration' 'wireless_tools: Wireless networking') -makedepends=(asciidoc) source=() sha256sums=() -- cgit v1.2.3 From dad9b760821b8699da8efffb230c3bf564392a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= Date: Mon, 11 Jun 2012 23:06:39 +0200 Subject: rc.d: remove bad examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rc.d must have explicit daemon name with command other than list Signed-off-by: Sébastien Luttringer --- rc.d | 1 - rc.d.8.txt | 6 ------ 2 files changed, 7 deletions(-) diff --git a/rc.d b/rc.d index 0cfbdaf..77852d7 100755 --- a/rc.d +++ b/rc.d @@ -23,7 +23,6 @@ e.g: $name list $name list sshd gpm $name list --started gpm $name start sshd gpm - $name stop --noauto $name help EOF exit ${1:-1} diff --git a/rc.d.8.txt b/rc.d.8.txt index d0bbcce..0f35884 100644 --- a/rc.d.8.txt +++ b/rc.d.8.txt @@ -72,15 +72,9 @@ Examples[[E]] *rc.d start sshd gpm*:: Starts *sshd* and *gpm* scripts. -*rc.d start --auto --stopped*:: - Starts all stopped scripts which are started at startup. - *rc.d stop crond*:: Stops the *crond* script. -*rc.d stop --noauto*:: - Stop all script which are not runned at startup - *rc.d restart crond*:: Restarts the *crond* script. -- cgit v1.2.3 From 911439c4411be3ba0bab41b8f11ce0598b0cae9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= Date: Sun, 10 Jun 2012 03:46:34 +0200 Subject: Remove ck_depends MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ck_depends is no more used and should not be used anymore Signed-off-by: Sébastien Luttringer --- functions | 9 --------- 1 file changed, 9 deletions(-) diff --git a/functions b/functions index 4a8ba7b..fd52317 100644 --- a/functions +++ b/functions @@ -229,15 +229,6 @@ start_daemon() { have_daemon "$1" && /etc/rc.d/"$1" start } -# Never use this function, it causes daemons to be stoped in the wrong order. -# The only way to start a daemon at boot is to add it to the DAEMONS array. -ck_depends() { - local daemon - for daemon; do - ck_daemon "$daemon" && start_daemon "$daemon" - done -} - start_daemon_bkgd() { stat_bkgd "Starting $1" (start_daemon "$1") >/dev/null & -- cgit v1.2.3 From 0a6787be2a197b4f23302e7d0a3db4ff189578ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= Date: Mon, 11 Jun 2012 23:33:30 +0200 Subject: rc.conf.5: fix daemon prefixes list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removing this line produce a bad formating in man page Signed-off-by: Sébastien Luttringer --- rc.conf.5.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/rc.conf.5.txt b/rc.conf.5.txt index 726ba23..347aba7 100644 --- a/rc.conf.5.txt +++ b/rc.conf.5.txt @@ -208,6 +208,7 @@ DAEMONS[[D]] *DAEMONS=* Daemons to start at boot-up (in this order) + - prefix a daemon with a ! to disable it - prefix a daemon with a @ to start it up in the background -- cgit v1.2.3 From 32a67cdc01639a2080c93f2a0d71859f196b6c7d Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Wed, 13 Jun 2012 03:47:31 +0000 Subject: Remove trailing colon from output Signed-off-by: Allan McRae [tomegun: do the same for startup too] Signed-off-by: Tom Gundersen --- rc.shutdown | 2 +- rc.sysinit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rc.shutdown b/rc.shutdown index c708b92..d10b2da 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -55,7 +55,7 @@ run_hook shutdown_postumount # Kill non-root encrypted partition mappings if [[ -f /etc/crypttab ]] && type -p cryptsetup >/dev/null; then - stat_busy "Deactivating encrypted volumes:" + stat_busy "Deactivating encrypted volumes" # Maybe someone has LVM on an encrypted block device # executing an extra vgchange is errorless [[ $USELVM = [Yy][Ee][Ss] ]] && vgchange --sysinit -a n &>/dev/null diff --git a/rc.sysinit b/rc.sysinit index a0bbaa6..b2ee6c3 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -90,7 +90,7 @@ activate_vgs # Set up non-root encrypted partition mappings if [[ -f /etc/crypttab ]] && type -p cryptsetup >/dev/null; then - stat_busy "Unlocking encrypted volumes:" + stat_busy "Unlocking encrypted volumes" crypto_unlocked=0 read_crypttab do_unlock && stat_done || stat_fail # Maybe someone has LVM on an encrypted block device -- cgit v1.2.3 From b86af28c50de9285a5b064d984c3c9ba60d8b1d2 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sun, 24 Jun 2012 15:50:18 +0200 Subject: mounting: let systemd-remount-fs deal with overwriting mount options Any api filesystem which appears in fstab is remounted with the correct mount options at the end of boot. Also, move the binfmt mount to where it is needed. Signed-off-by: Tom Gundersen --- rc.multi | 2 ++ rc.sysinit | 8 ++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/rc.multi b/rc.multi index d558753..daf2372 100755 --- a/rc.multi +++ b/rc.multi @@ -12,6 +12,8 @@ run_hook multi_start /usr/lib/systemd/systemd-sysctl # Load additional binary formats +mountpoint -q /proc/sys/fs/binfmt_misc || mount /proc/sys/fs/binfmt_misc &>/dev/null || + mount -t binfmt_misc binfmt /proc/sys/fs/binfmt_misc /usr/lib/systemd/systemd-binfmt # Start daemons diff --git a/rc.sysinit b/rc.sysinit index b2ee6c3..a40cc06 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -25,12 +25,8 @@ mountpoint -q /run || mount -t tmpfs run /run -o mode=0755,nosuid,nodev mountpoint -q /dev || mount -t devtmpfs dev /dev -o mode=0755,nosuid mkdir -p -m 1777 /run/lock mkdir -p /dev/{pts,shm} -mountpoint -q /dev/pts || mount /dev/pts &>/dev/null || - mount -t devpts devpts /dev/pts -o mode=0620,gid=5,nosuid,noexec -mountpoint -q /dev/shm || mount /dev/shm &>/dev/null || - mount -t tmpfs shm /dev/shm -o mode=1777,nosuid,nodev -mountpoint -q /proc/sys/fs/binfmt_misc || mount /proc/sys/fs/binfmt_misc &>/dev/null || - mount -t binfmt_misc binfmt /proc/sys/fs/binfmt_misc +mountpoint -q /dev/pts || mount -t devpts devpts /dev/pts -o mode=0620,gid=5,nosuid,noexec +mountpoint -q /dev/shm || mount -t tmpfs shm /dev/shm -o mode=1777,nosuid,nodev # log all console messages bootlogd -p /run/bootlogd.pid -- cgit v1.2.3 From f5e8f68a7dc8044337bfee9d3af8117690ce473a Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sun, 24 Jun 2012 15:51:46 +0200 Subject: rc.sysinit: don't create /run/lock This is done by tmpfiles, and we want to use the permissions in the config file, rather than hardcoding them. Signed-off-by: Tom Gundersen --- rc.sysinit | 1 - 1 file changed, 1 deletion(-) diff --git a/rc.sysinit b/rc.sysinit index a40cc06..70025a1 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -23,7 +23,6 @@ mountpoint -q /proc || mount -t proc proc /proc -o nosuid,noexec,nodev mountpoint -q /sys || mount -t sysfs sys /sys -o nosuid,noexec,nodev mountpoint -q /run || mount -t tmpfs run /run -o mode=0755,nosuid,nodev mountpoint -q /dev || mount -t devtmpfs dev /dev -o mode=0755,nosuid -mkdir -p -m 1777 /run/lock mkdir -p /dev/{pts,shm} mountpoint -q /dev/pts || mount -t devpts devpts /dev/pts -o mode=0620,gid=5,nosuid,noexec mountpoint -q /dev/shm || mount -t tmpfs shm /dev/shm -o mode=1777,nosuid,nodev -- cgit v1.2.3 From 9f365dbf216f3d7a504928fc64dcdb5941ad449b Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sun, 24 Jun 2012 16:22:58 +0200 Subject: tmpfiles: actually remove old files on boot We were not deleting old files as we forgot to add the --clean flag Signed-off-by: Tom Gundersen --- functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions b/functions index fd52317..000cd60 100644 --- a/functions +++ b/functions @@ -580,7 +580,7 @@ umount_all() { } remove_leftover() { - status -v 'Removing Leftover Files' systemd-tmpfiles --create --remove + status -v 'Removing Leftover Files' systemd-tmpfiles --create --remove --clean } bootlogd_stop() { -- cgit v1.2.3