aboutsummaryrefslogtreecommitdiff
path: root/rc.sysinit
diff options
context:
space:
mode:
authorJason St. John <jstjohn@purdue.edu>2012-07-06 20:03:09 (GMT)
committerTom Gundersen <teg@jklm.no>2012-07-12 00:11:59 (GMT)
commitc2f7b97924e2b5341cea667fbd1a2802e9cb8cd5 (patch)
tree5a7ee1b909f1063859333faeb9d40354ad9c2547 /rc.sysinit
parentb2c9096cf0be6d655550ae880da8735ef048fc10 (diff)
downloadinitscripts-c2f7b97924e2b5341cea667fbd1a2802e9cb8cd5.tar.xz
Correct spelling and grammar throughout
This patch addresses the issues with my previous patch submission here: https://mailman.archlinux.org/pipermail/arch-projects/2012-June/002990.html The notable changes between this patch and the previous one are below: -- this patch does not rename set_timezone() -- 'filesystems' and 'bash' are left as-is -- everything is in one patch, not two -- the 'makedepends' change is no longer relevant because the duplication of it was already removed in a later commit Regarding the capitalization of "Btrfs", it seems that upstream prefers "Btrfs".[1][2] Regarding 'https://' vs. 'http://', I left this change in the patch because stating 'https://www.archlinux.org' in the start-up messages doesn't force anyone to use HTTPS over HTTP. It simply shows that HTTPS is available for use. If someone really doesn't want to use HTTPS, they don't have to. Finally, Dan McGee stated that HTTPS will be used all the time soon.[3] [1] https://oss.oracle.com/projects/btrfs/ [2] https://btrfs.wiki.kernel.org/index.php/Main_Page [3] https://bugs.archlinux.org/task/30486#comment96222 Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Diffstat (limited to 'rc.sysinit')
-rwxr-xr-xrc.sysinit46
1 files changed, 23 insertions, 23 deletions
diff --git a/rc.sysinit b/rc.sysinit
index 1106503..2d7df3e 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -14,10 +14,10 @@ fi
echo " "
printhl "Arch Linux\n"
-printhl "${C_H2}http://www.archlinux.org"
+printhl "${C_H2}https://www.archlinux.org"
printsep
-# mount the api filesystems
+# mount the API filesystems
# /proc, /sys, /run, /dev, /run/lock, /dev/pts, /dev/shm
mountpoint -q /proc || mount -t proc proc /proc -o nosuid,noexec,nodev
mountpoint -q /sys || mount -t sysfs sys /sys -o nosuid,noexec,nodev
@@ -34,7 +34,7 @@ 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 ||
- status "Mounting Root Read-Only" mount -o remount,ro /
+ status "Mounting root read-only" mount -o remount,ro /
fi
run_hook sysinit_start
@@ -48,26 +48,26 @@ case $HARDWARECLOCK in
esac
if [[ $HWCLOCK_PARAMS ]]; then
- stat_busy "Adjusting system time and setting kernel timezone"
+ stat_busy "Adjusting system time and setting kernel time zone"
- # Adjust the system time for timezone offset if rtc is not in UTC
+ # Adjust the system time for time zone offset if rtc is not in UTC
# 1. Make creation time on device nodes sane (FS#8665)
# 2. Filesystem checks can depend on system time
# 3. This also sets the kernel time zone, used by e.g. vfat
- # If TIMEZONE is not set in rc.conf, the timezone stored in /etc/localtime
- # is used. If HARDWARECLOCK is not set in rc.conf, the value in
- # /var/lib/hwclock/adjfile is used (in this case /var can not be a separate
+ # If TIMEZONE is not set in /etc/rc.conf, the time zone stored in /etc/localtime
+ # is used. If HARDWARECLOCK is not set in /etc/rc.conf, the value in
+ # /var/lib/hwclock/adjfile is used (in this case, /var cannot be a separate
# partition).
[[ $TIMEZONE ]] && export TZ=$TIMEZONE
hwclock $HWCLOCK_PARAMS && stat_done || stat_fail
unset TZ
fi
-# Start/trigger UDev, load MODULES and settle UDev
+# Start/trigger udev, load MODULES, and settle udev
udevd_modprobe sysinit
# this must be done after udev has loaded the KMS modules
-status 'Configuring Virtual Consoles' /usr/lib/systemd/systemd-vconsole-setup
+status 'Configuring virtual consoles' /usr/lib/systemd/systemd-vconsole-setup
# bring up the loopback interface
[[ -d /sys/class/net/lo ]] &&
@@ -77,11 +77,11 @@ status 'Configuring Virtual Consoles' /usr/lib/systemd/systemd-vconsole-setup
[[ $USEDMRAID = [Yy][Ee][Ss] && -x $(type -P dmraid) ]] &&
status "Activating FakeRAID arrays" dmraid -i -ay
-# BTRFS devices detection
+# Btrfs devices detection
[[ $USEBTRFS = [Yy][Ee][Ss] && -x $(type -P btrfs) ]] &&
- status "Activating BTRFS volumes" btrfs device scan
+ status "Activating Btrfs volumes" btrfs device scan
-# Activate LVM2 groups if any
+# Activate LVM2 groups, if any
activate_vgs
# Set up non-root encrypted partition mappings
@@ -96,7 +96,7 @@ fi
# Check filesystems
run_hook sysinit_prefsck
if [[ -x $(type -P fsck) ]]; then
- stat_busy "Checking Filesystems"
+ stat_busy "Checking filesystems"
fsck_all >|"${FSCK_OUT:-/dev/stdout}" 2>|"${FSCK_ERR:-/dev/stdout}"
declare -r fsckret=$?
(( fsckret <= 1 )) && stat_done || stat_fail
@@ -108,25 +108,25 @@ run_hook sysinit_postfsck
# Single-user login and/or automatic reboot if needed
fsck_reboot $fsckret
-status "Remounting Root and API filesystems" \
+status "Remounting root and API filesystems" \
/usr/lib/systemd/systemd-remount-fs
-# now mount all the local filesystems
+# Now mount all the local filesystems
run_hook sysinit_premount
-status "Mounting Local Filesystems" \
+status "Mounting local filesystems" \
mount_all
run_hook sysinit_postmount
-# enable monitoring of lvm2 groups, now that the filesystems are mounted rw
+# Enable monitoring of LVM2 groups, now that the filesystems are mounted rw
[[ $USELVM = [Yy][Ee][Ss] && -x $(type -P lvm) && -d /sys/block ]] &&
status "Activating monitoring of LVM2 groups" \
vgchange --monitor y >/dev/null
-status "Activating Swap" swapon -a
+status "Activating swap" swapon -a
-[[ $TIMEZONE ]] && status "Configuring Time Zone" set_timezone "$TIMEZONE"
+[[ $TIMEZONE ]] && status "Configuring time zone" set_timezone "$TIMEZONE"
-status 'Initializing Random Seed' /usr/lib/systemd/systemd-random-seed load
+status 'Initializing random seed' /usr/lib/systemd/systemd-random-seed load
# Remove leftover files
remove_leftover
@@ -135,11 +135,11 @@ if [[ -s /etc/hostname ]]; then
HOSTNAME=$(< /etc/hostname)
fi
if [[ $HOSTNAME ]]; then
- stat_busy "Setting Hostname: $HOSTNAME"
+ stat_busy "Setting hostname: $HOSTNAME"
echo "$HOSTNAME" >| /proc/sys/kernel/hostname && stat_done || stat_fail
fi
-stat_busy "Saving dmesg Log"
+stat_busy "Saving dmesg log"
if [[ -e /proc/sys/kernel/dmesg_restrict ]] &&
(( $(< /proc/sys/kernel/dmesg_restrict) == 1 )); then
install -Tm 0600 <( dmesg ) /var/log/dmesg.log