diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-10-30 01:40:41 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-10-30 01:40:41 -0300 |
| commit | c3d6cdb72f7130d3361bc1b8c99e862fe15a75fa (patch) | |
| tree | b664bed188c0de713be8a4649fdd86664d1c2867 /rc.sysinit | |
| parent | ede246d73091a7b733ae56819fc7296e18aa4c31 (diff) | |
| parent | 00070eca730dec9c6d587cc1639f6abaca83fa34 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/initscripts2011.10.3
Conflicts:
PKGBUILD
Diffstat (limited to 'rc.sysinit')
| -rwxr-xr-x | rc.sysinit | 20 |
1 files changed, 14 insertions, 6 deletions
@@ -16,7 +16,7 @@ printsep mountpoint -q /proc || mount -n -t proc proc /proc -o nosuid,noexec,nodev mountpoint -q /sys || mount -n -t sysfs sys /sys -o nosuid,noexec,nodev mountpoint -q /run || mount -n -t tmpfs run /run -o mode=0755,size=10M,nosuid,nodev -mountpoint -q /dev || mount -n -t devtmpfs udev /dev -o mode=0755,size=10M,nosuid &>/dev/null \ +mountpoint -q /dev || mount -n -t devtmpfs udev /dev -o mode=0755,size=10M,nosuid \ || mount -n -t tmpfs udev /dev -o mode=0755,size=10M,nosuid mkdir -p -m 1777 /run/lock mkdir -p /dev/{pts,shm} @@ -32,8 +32,7 @@ findmnt / --options ro &>/dev/null || run_hook sysinit_start -# start up our mini logger until syslog takes over -minilogd +# log all console messages bootlogd -p /run/bootlogd.pid if [[ ! -a /usr/lib ]] ; then @@ -201,6 +200,7 @@ status "Remounting Root Read/Write" \ # don't touch /etc/mtab if it is a symlink to /proc/self/mounts if [[ ! -L /etc/mtab ]]; then stat_busy "Creating mtab" + rm -f /etc/mtab~* # delete any stale locks if [[ -x $(type -P findmnt) && -e /proc/self/mountinfo ]]; then findmnt -rnu -o SOURCE,TARGET,FSTYPE,OPTIONS >| /etc/mtab else @@ -222,9 +222,7 @@ run_hook sysinit_postmount status "Activating Swap" swapon -a -[[ $TIMEZONE ]] && - status "Configuring Time Zone" \ - cp --remove-destination "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime +[[ $TIMEZONE ]] && status "Configuring Time Zone" set_timezone "$TIMEZONE" RANDOM_SEED=/var/lib/misc/random-seed [[ -f $RANDOM_SEED ]] && @@ -239,6 +237,10 @@ if [[ $HOSTNAME ]]; then echo "$HOSTNAME" >| /proc/sys/kernel/hostname && stat_done || stat_fail fi +if [[ -s /etc/locale.conf ]]; then + . /etc/locale.conf + [[ $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 @@ -260,6 +262,12 @@ else echo 0 >| /sys/module/vt/parameters/default_utf8 stat_done fi + +if [[ -s /etc/vconsole.conf ]]; then + . /etc/vconsole.conf + [[ $FONT ]] && CONSOLEFONT=$FONT + [[ $FONT_MAP ]] && CONSOLEMAP=$FONT_MAP +fi [[ $KEYMAP ]] && status "Loading Keyboard Map: $KEYMAP" loadkeys -q $KEYMAP |