summaryrefslogtreecommitdiff
path: root/rc.sysinit
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-06-01 12:57:32 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-06-01 12:57:32 -0300
commita8a948b7ae57f660f61ce44251f938d9317c113b (patch)
tree519d9eb03bc0352e6a084c336f63bcc7ae00e794 /rc.sysinit
parent10c7127d5ff693a8f0c9671b9d3253315f2095be (diff)
parenta20ce0e666b5c97080a880eee9d8301c3d48b177 (diff)
Merge branch 'master' of git://projects.archlinux.org/initscripts2012.06.1
Conflicts: hostname.5.txt locale.conf.5.txt
Diffstat (limited to 'rc.sysinit')
-rwxr-xr-xrc.sysinit55
1 files changed, 12 insertions, 43 deletions
diff --git a/rc.sysinit b/rc.sysinit
index 854016f..53969d8 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -21,9 +21,11 @@ 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 -n -t devpts devpts /dev/pts -o mode=0620,gid=5,nosuid,noexec
+ mount -t devpts devpts /dev/pts -o mode=0620,gid=5,nosuid,noexec
mountpoint -q /dev/shm || mount /dev/shm &>/dev/null ||
- mount -n -t tmpfs shm /dev/shm -o mode=1777,nosuid,nodev
+ 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
# remount root ro to allow for fsck later on, we remount now to
@@ -37,43 +39,6 @@ run_hook sysinit_start
# log all console messages
bootlogd -p /run/bootlogd.pid
-if [[ -s /etc/locale.conf ]]; then
- parse_envfile /etc/locale.conf "LANG"
- [[ $LANG ]] && LOCALE=$LANG
-fi
-if [[ ${LOCALE,,} =~ utf ]]; then
- stat_busy "Setting Consoles to UTF-8 mode"
- # UTF-8 consoles are default since 2.6.24 kernel
- # this code is needed not only for older kernels,
- # but also when user has set vt.default_utf8=0 but LOCALE is *.UTF-8.
- for i in /dev/tty[0-9]*; do
- kbd_mode -u < ${i}
- printf "\e%%G" > ${i}
- done
- echo 1 >| /sys/module/vt/parameters/default_utf8
- stat_done
-else
- stat_busy "Setting Consoles to legacy mode"
- # make non-UTF-8 consoles work on 2.6.24 and newer kernels
- for i in /dev/tty[0-9]*; do
- kbd_mode -a < ${i}
- printf "\e%%@" > ${i}
- done
- echo 0 >| /sys/module/vt/parameters/default_utf8
- stat_done
-fi
-
-if [[ -s /etc/vconsole.conf ]]; then
- parse_envfile /etc/vconsole.conf "${vconsolevars[@]}"
- [[ $FONT ]] && CONSOLEFONT=$FONT
- [[ $FONT_MAP ]] && CONSOLEMAP=$FONT_MAP
-fi
-[[ $KEYMAP ]] &&
- status "Loading Keyboard Map: $KEYMAP" loadkeys -q $KEYMAP
-
-# Set console font if required
-set_consolefont
-
if [[ ! -a /usr/lib ]] ; then
printf "${C_FAIL}/usr is not mounted. This is not supported.${C_OTHER}\n"
fi
@@ -109,6 +74,13 @@ 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
@@ -166,10 +138,7 @@ status "Activating Swap" swapon -a
[[ $TIMEZONE ]] && status "Configuring Time Zone" set_timezone "$TIMEZONE"
-RANDOM_SEED=/var/lib/misc/random-seed
-[[ -f $RANDOM_SEED ]] &&
- status "Initializing Random Seed" \
- cp $RANDOM_SEED /dev/urandom
+status 'Initializing Random Seed' /usr/lib/systemd/systemd-random-seed load
# Remove leftover files
remove_leftover