summaryrefslogtreecommitdiff
path: root/rc.sysinit
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-06-28 01:04:03 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-06-28 01:04:03 -0300
commit56858ebfd0d3eaf56be2a5ac5f9766acaf7067c7 (patch)
treee6901f7faae817f579acdc3861d81bdf39708576 /rc.sysinit
parentbd6b5d7f38b6cd98302162068bcb4162bf14c095 (diff)
parent9f365dbf216f3d7a504928fc64dcdb5941ad449b (diff)
Merge branch 'master' of git://projects.archlinux.org/initscripts2012.06.28
Diffstat (limited to 'rc.sysinit')
-rwxr-xr-xrc.sysinit36
1 files changed, 16 insertions, 20 deletions
diff --git a/rc.sysinit b/rc.sysinit
index d1bf60a..db4a677 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 "Parabola GNU/Linux-Libre\n"
printhl "${C_H2}http://parabolagnulinux.org"
@@ -18,16 +24,16 @@ 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 /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
-
-if [[ ! -e /run/initramfs/fsck-root ]]; then
+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
+
+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
findmnt / --options ro &>/dev/null ||
@@ -36,9 +42,6 @@ fi
run_hook sysinit_start
-# log all console messages
-bootlogd -p /run/bootlogd.pid
-
HWCLOCK_PARAMS="--systz"
case $HARDWARECLOCK in
"") ;;
@@ -66,13 +69,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"
- [[ $LANG ]] && LOCALE=$LANG
-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
@@ -90,7 +86,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