Ver código fonte

Minor configuration file upgrades

Parallel services startup is experimental, and has been removed
from the default options list in OpenRC's rc.conf.
Maxim Kammerer 13 anos atrás
pai
commit
2b97c28072
5 arquivos alterados com 6 adições e 5 exclusões
  1. 1 0
      doc/changelog.txt
  2. 1 1
      mkimage
  3. 3 0
      src/etc/conf.d/fsck
  4. 1 1
      src/etc/conf.d/localmount
  5. 0 3
      src/etc/rc.conf

+ 1 - 0
doc/changelog.txt

@@ -7,6 +7,7 @@
   * Fixed 3G support for modems with PIN unlocking
   * More extensive firmware support
   * Better filesystem security (read-only root fs)
+  * Added "readonly" boot parameter for disabling persistence
 
   * Cables communication now maintains repudiability
   * Added Open Virtualization bundle (OVA)

+ 1 - 1
mkimage

@@ -97,7 +97,7 @@ count=0 last= sqsort=`mktemp`
 for p in ${livecd}/tmp/transient/pkg/unlisted-files ${livecd}/tmp/transient/pkg/*=*; do
     chroot ${livecd} file -zhN --mime-type -F '' -f ${p#${livecd}} \
         | sed -n "s:^/\(.*\)/\([^/]*\) \(.*\)$:\3 ${p##*/} \1 \1/\2:p"
-done | sort | while read id1 id2 id3 file; do
+done | sort -s -k1,3 | while read id1 id2 id3 file; do
     if [ "${id1},${id2},${id3}" != "${last}" ]; then
         count=$((count-1))
         last="${id1},${id2},${id3}"

+ 3 - 0
src/etc/conf.d/fsck

@@ -5,6 +5,9 @@ fsck_args="-A -a"
 # Whether to check only specific passno's
 # fsck_passno="=1 =2 >1 <2"
 
+# Mountpoints to check (mutually exclusive with fsck_passno)
+# fsck_mnt="/home"
+
 # Whether to trigger when on battery as well as AC
 # (do not turn off for JFS partitions)
 fsck_on_battery="YES"

+ 1 - 1
src/etc/conf.d/localmount

@@ -3,5 +3,5 @@
 #   /mnt/live            - ro squashfs bind unionfs branch
 #   /mnt/restrict/rwroot - rw tmpfs         unionfs branch
 #   /mnt/restrict/union  - rw unionfs
-#   /etc:/var            - rw unionfs busy binds into ro / (see initramfs's init)
+#   /etc, /var           - rw unionfs busy binds into ro / (see initramfs's init)
 no_umounts="/mnt/boot:/mnt/live:/mnt/restrict/rwroot:/mnt/restrict/union:/etc:/var"

+ 0 - 3
src/etc/rc.conf

@@ -1,9 +1,6 @@
 # ====================================
 # Global OpenRC configuration settings
 
-# Parallel service startup is fast but not entirely stable
-rc_parallel="YES"
-
 # Entering interactive mode with 'I'
 rc_interactive="NO"