Annotation of /trunk/dracut/patches/dracut-018-magellan.patch
Parent Directory | Revision Log
Revision 1765 -
(hide annotations)
(download)
Mon May 7 08:47:49 2012 UTC (12 years, 4 months ago) by niro
File size: 15294 byte(s)
Mon May 7 08:47:49 2012 UTC (12 years, 4 months ago) by niro
File size: 15294 byte(s)
-re-diffed for dracut-018
1 | niro | 1765 | diff -Naur dracut-018/dracut.conf.d/magellan.conf.example dracut-018-magellan/dracut.conf.d/magellan.conf.example |
2 | --- dracut-018/dracut.conf.d/magellan.conf.example 1970-01-01 01:00:00.000000000 +0100 | ||
3 | +++ dracut-018-magellan/dracut.conf.d/magellan.conf.example 2012-05-07 11:24:20.730982535 +0200 | ||
4 | @@ -0,0 +1,9 @@ | ||
5 | +# Dracut config file customized for Magellan-Linux | ||
6 | + | ||
7 | +# i18n | ||
8 | +i18n_vars="/etc/conf.d/keymap:KEYMAP /etc/conf.d/consolefont:CONSOLEFONT" | ||
9 | +omit_dracutmodules+=" dash " | ||
10 | +omit_drivers+=" .*/fs/ocfs/.* " | ||
11 | +stdloglvl=3 | ||
12 | +realinitpath="/usr/lib/systemd/systemd" | ||
13 | +install_items+=" nano /etc/nanorc lsmod ps grep cat rm " | ||
14 | diff -Naur dracut-018/Makefile dracut-018-magellan/Makefile | ||
15 | --- dracut-018/Makefile 2012-04-05 13:54:38.000000000 +0200 | ||
16 | +++ dracut-018-magellan/Makefile 2012-05-07 11:28:16.153982524 +0200 | ||
17 | @@ -44,6 +44,9 @@ | ||
18 | install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd | ||
19 | install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf | ||
20 | mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d | ||
21 | + install -m 0644 dracut.conf.d/magellan.conf.example $(DESTDIR)$(sysconfdir)/dracut.conf.d/01-magellan.conf | ||
22 | + mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d | ||
23 | + install -m 0644 dracut.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/dracut | ||
24 | install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh | ||
25 | ln -s dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions | ||
26 | install -m 0755 dracut-logger.sh $(DESTDIR)$(pkglibdir)/dracut-logger.sh | ||
27 | diff -Naur dracut-018/modules.d/10i18n/console_init.sh dracut-018-magellan/modules.d/10i18n/console_init.sh | ||
28 | --- dracut-018/modules.d/10i18n/console_init.sh 2012-04-05 13:54:38.000000000 +0200 | ||
29 | +++ dracut-018-magellan/modules.d/10i18n/console_init.sh 2012-05-07 11:28:54.992982524 +0200 | ||
30 | @@ -5,7 +5,7 @@ | ||
31 | [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf | ||
32 | |||
33 | DEFAULT_FONT=LatArCyrHeb-16 | ||
34 | -DEFAULT_KEYMAP=/etc/sysconfig/console/default.kmap | ||
35 | +DEFAULT_KEYMAP=/etc/conf.d/console/default.kmap | ||
36 | |||
37 | set_keyboard() { | ||
38 | local param | ||
39 | diff -Naur dracut-018/modules.d/40network/module-setup.sh dracut-018-magellan/modules.d/40network/module-setup.sh | ||
40 | --- dracut-018/modules.d/40network/module-setup.sh 2012-04-05 13:54:38.000000000 +0200 | ||
41 | +++ dracut-018-magellan/modules.d/40network/module-setup.sh 2012-05-07 11:29:22.930982522 +0200 | ||
42 | @@ -17,7 +17,7 @@ | ||
43 | } | ||
44 | |||
45 | depends() { | ||
46 | - [ -d /etc/sysconfig/network-scripts/ ] && echo ifcfg | ||
47 | + [ -d /etc/conf.d/network-scripts/ ] && echo ifcfg | ||
48 | return 0 | ||
49 | } | ||
50 | |||
51 | diff -Naur dracut-018/modules.d/40uvesafb/module-setup.sh dracut-018-magellan/modules.d/40uvesafb/module-setup.sh | ||
52 | --- dracut-018/modules.d/40uvesafb/module-setup.sh 1970-01-01 01:00:00.000000000 +0100 | ||
53 | +++ dracut-018-magellan/modules.d/40uvesafb/module-setup.sh 2012-05-07 11:30:37.186982518 +0200 | ||
54 | @@ -0,0 +1,18 @@ | ||
55 | +#!/bin/sh | ||
56 | + | ||
57 | +check() { | ||
58 | + [ -x /sbin/v86d ] | ||
59 | +} | ||
60 | + | ||
61 | +depends() { | ||
62 | + return 0 | ||
63 | +} | ||
64 | + | ||
65 | +installkernel() { | ||
66 | + hostonly='' instmods uvesafb | ||
67 | +} | ||
68 | + | ||
69 | +install() { | ||
70 | + dracut_install /sbin/v86d | ||
71 | + inst_hook pre-trigger 9 "$moddir"/uvesafb-pretrigger.sh | ||
72 | +} | ||
73 | diff -Naur dracut-018/modules.d/40uvesafb/uvesafb-pretrigger.sh dracut-018-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh | ||
74 | --- dracut-018/modules.d/40uvesafb/uvesafb-pretrigger.sh 1970-01-01 01:00:00.000000000 +0100 | ||
75 | +++ dracut-018-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh 2012-05-07 11:31:06.451982524 +0200 | ||
76 | @@ -0,0 +1,6 @@ | ||
77 | +#!/bin/sh | ||
78 | + | ||
79 | +if getargbool 1 rd.uvesafb -n rd_NO_UVESAFB; then | ||
80 | + [ ! -c /dev/fb0 -a -e /sbin/v86d ] && modprobe uvesafb | ||
81 | +fi | ||
82 | + | ||
83 | diff -Naur dracut-018/modules.d/45ifcfg/write-ifcfg.sh dracut-018-magellan/modules.d/45ifcfg/write-ifcfg.sh | ||
84 | --- dracut-018/modules.d/45ifcfg/write-ifcfg.sh 2012-04-05 13:54:38.000000000 +0200 | ||
85 | +++ dracut-018-magellan/modules.d/45ifcfg/write-ifcfg.sh 2012-05-07 11:36:01.817982524 +0200 | ||
86 | @@ -141,13 +141,13 @@ | ||
87 | done | ||
88 | |||
89 | # Pass network opts | ||
90 | -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts | ||
91 | +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts | ||
92 | mkdir -m 0755 -p /run/initramfs/state/var/lib/dhclient | ||
93 | -echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab | ||
94 | +echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab | ||
95 | echo "files /var/lib/dhclient" >> /run/initramfs/rwtab | ||
96 | { | ||
97 | cp /tmp/net.* /run/initramfs/ | ||
98 | cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/ | ||
99 | - cp -a -t /run/initramfs/state/etc/sysconfig/network-scripts/ /tmp/ifcfg/* | ||
100 | + cp -a -t /run/initramfs/state/etc/conf.d/network-scripts/ /tmp/ifcfg/* | ||
101 | cp /tmp/ifcfg-leases/* /run/initramfs/state/var/lib/dhclient | ||
102 | } > /dev/null 2>&1 | ||
103 | diff -Naur dracut-018/modules.d/80cms/cms-write-ifcfg.sh dracut-018-magellan/modules.d/80cms/cms-write-ifcfg.sh | ||
104 | --- dracut-018/modules.d/80cms/cms-write-ifcfg.sh 2012-04-05 13:54:38.000000000 +0200 | ||
105 | +++ dracut-018-magellan/modules.d/80cms/cms-write-ifcfg.sh 2012-05-07 11:43:56.353982521 +0200 | ||
106 | @@ -4,7 +4,7 @@ | ||
107 | |||
108 | type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh | ||
109 | |||
110 | -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts | ||
111 | +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts | ||
112 | |||
113 | function cms_write_config() | ||
114 | { | ||
115 | @@ -24,18 +24,18 @@ | ||
116 | |||
117 | uuid=$(cat /proc/sys/kernel/random/uuid) | ||
118 | |||
119 | - IFCFGFILE=/run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-$DEVICE | ||
120 | + IFCFGFILE=/run/initramfs/state/etc/conf.d/network-scripts/ifcfg-$DEVICE | ||
121 | |||
122 | strstr "$IPADDR" '*:*:*' && ipv6=1 | ||
123 | |||
124 | # to please NetworkManager on startup in loader before loader reconfigures net | ||
125 | - cat > /etc/sysconfig/network << EOF | ||
126 | + cat > /etc/conf.d/network << EOF | ||
127 | HOSTNAME=$HOSTNAME | ||
128 | EOF | ||
129 | if [ "$ipv6" ]; then | ||
130 | - echo "NETWORKING_IPV6=yes" >> /etc/sysconfig/network | ||
131 | + echo "NETWORKING_IPV6=yes" >> /etc/conf.d/network | ||
132 | else | ||
133 | - echo "NETWORKING=yes" >> /etc/sysconfig/network | ||
134 | + echo "NETWORKING=yes" >> /etc/conf.d/network | ||
135 | fi | ||
136 | |||
137 | cat > $IFCFGFILE << EOF | ||
138 | @@ -97,7 +97,7 @@ | ||
139 | unset optstr | ||
140 | unset DNS1 | ||
141 | unset DNS2 | ||
142 | - echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab | ||
143 | + echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab | ||
144 | echo "files /var/lib/dhclient" >> /run/initramfs/rwtab | ||
145 | } | ||
146 | |||
147 | diff -Naur dracut-018/modules.d/95rootfs-block/mount-root.sh dracut-018-magellan/modules.d/95rootfs-block/mount-root.sh | ||
148 | --- dracut-018/modules.d/95rootfs-block/mount-root.sh 2012-04-05 13:54:38.000000000 +0200 | ||
149 | +++ dracut-018-magellan/modules.d/95rootfs-block/mount-root.sh 2012-05-07 11:37:01.722982524 +0200 | ||
150 | @@ -34,8 +34,8 @@ | ||
151 | |||
152 | READONLY= | ||
153 | fsckoptions= | ||
154 | - if [ -f "$NEWROOT"/etc/sysconfig/readonly-root ]; then | ||
155 | - . "$NEWROOT"/etc/sysconfig/readonly-root | ||
156 | + if [ -f "$NEWROOT"/etc/conf.d/readonly-root ]; then | ||
157 | + . "$NEWROOT"/etc/conf.d/readonly-root | ||
158 | fi | ||
159 | |||
160 | if getargbool 0 "readonlyroot=" -y readonlyroot; then | ||
161 | @@ -57,7 +57,7 @@ | ||
162 | if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then | ||
163 | fsckoptions="-f $fsckoptions" | ||
164 | elif [ -f "$NEWROOT"/.autofsck ]; then | ||
165 | - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && . "$NEWROOT"/etc/sysconfig/autofsck | ||
166 | + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && . "$NEWROOT"/etc/conf.d/autofsck | ||
167 | if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then | ||
168 | AUTOFSCK_OPT="$AUTOFSCK_OPT -f" | ||
169 | fi | ||
170 | diff -Naur dracut-018/modules.d/95udev-rules/module-setup.sh dracut-018-magellan/modules.d/95udev-rules/module-setup.sh | ||
171 | --- dracut-018/modules.d/95udev-rules/module-setup.sh 2012-04-05 13:54:38.000000000 +0200 | ||
172 | +++ dracut-018-magellan/modules.d/95udev-rules/module-setup.sh 2012-05-07 11:37:57.771982523 +0200 | ||
173 | @@ -74,6 +74,13 @@ | ||
174 | [ -f /etc/arch-release ] && \ | ||
175 | inst "$moddir/load-modules.sh" /lib/udev/load-modules.sh | ||
176 | |||
177 | + # magellan uses a special modprobe script too | ||
178 | + if [ -f /etc/mageversion ] | ||
179 | + then | ||
180 | + [ -e /lib/udev/modprobe.sh ] && dracut_install /lib/udev/modprobe.sh | ||
181 | + [ -f /etc/udev/blacklist ] && dracut_install /etc/udev/blacklist | ||
182 | + fi | ||
183 | + | ||
184 | for _i in {"$libdir","$usrlibdir"}/libnss_files*; do | ||
185 | [ -e "$_i" ] && dracut_install "$_i" | ||
186 | done | ||
187 | diff -Naur dracut-018/modules.d/97masterkey/masterkey.sh dracut-018-magellan/modules.d/97masterkey/masterkey.sh | ||
188 | --- dracut-018/modules.d/97masterkey/masterkey.sh 2012-04-05 13:54:38.000000000 +0200 | ||
189 | +++ dracut-018-magellan/modules.d/97masterkey/masterkey.sh 2012-05-07 11:38:21.692982523 +0200 | ||
190 | @@ -8,7 +8,7 @@ | ||
191 | # TORSEC group -- http://security.polito.it | ||
192 | # Roberto Sassu <roberto.sassu@polito.it> | ||
193 | |||
194 | -MASTERKEYSCONFIG="${NEWROOT}/etc/sysconfig/masterkey" | ||
195 | +MASTERKEYSCONFIG="${NEWROOT}/etc/conf.d/masterkey" | ||
196 | MULTIKERNELMODE="NO" | ||
197 | PCRLOCKNUM=11 | ||
198 | |||
199 | diff -Naur dracut-018/modules.d/97masterkey/README dracut-018-magellan/modules.d/97masterkey/README | ||
200 | --- dracut-018/modules.d/97masterkey/README 2012-04-05 13:54:38.000000000 +0200 | ||
201 | +++ dracut-018-magellan/modules.d/97masterkey/README 2012-05-07 11:38:42.556982524 +0200 | ||
202 | @@ -39,7 +39,7 @@ | ||
203 | MASTERKEY="/etc/keys/kmk-${MASTERKEYTYPE}.blob" | ||
204 | -------------------------------------------------------------------------- | ||
205 | |||
206 | -2) create the configuration file '/etc/sysconfig/masterkey' to override the | ||
207 | +2) create the configuration file '/etc/conf.d/masterkey' to override the | ||
208 | value of one or all variables; | ||
209 | |||
210 | 3) specify these parameters in the kernel command line: | ||
211 | diff -Naur dracut-018/modules.d/98ecryptfs/ecryptfs-mount.sh dracut-018-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh | ||
212 | --- dracut-018/modules.d/98ecryptfs/ecryptfs-mount.sh 2012-04-05 13:54:38.000000000 +0200 | ||
213 | +++ dracut-018-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh 2012-05-07 11:39:05.060982524 +0200 | ||
214 | @@ -8,7 +8,7 @@ | ||
215 | # TORSEC group -- http://security.polito.it | ||
216 | # Roberto Sassu <roberto.sassu@polito.it> | ||
217 | |||
218 | -ECRYPTFSCONFIG="${NEWROOT}/etc/sysconfig/ecryptfs" | ||
219 | +ECRYPTFSCONFIG="${NEWROOT}/etc/conf.d/ecryptfs" | ||
220 | ECRYPTFSKEYTYPE="encrypted" | ||
221 | ECRYPTFSKEYDESC="1000100010001000" | ||
222 | ECRYPTFSKEYID="" | ||
223 | diff -Naur dracut-018/modules.d/98ecryptfs/README dracut-018-magellan/modules.d/98ecryptfs/README | ||
224 | --- dracut-018/modules.d/98ecryptfs/README 2012-04-05 13:54:38.000000000 +0200 | ||
225 | +++ dracut-018-magellan/modules.d/98ecryptfs/README 2012-05-07 11:39:27.951982524 +0200 | ||
226 | @@ -23,13 +23,13 @@ | ||
227 | ECRYPTFSKEY="/etc/keys/ecryptfs-trusted.blob" | ||
228 | -------------------------------------------------------------------------- | ||
229 | |||
230 | -2) create the configuration file '/etc/sysconfig/ecryptfs' and set the ECRYPTFSKEY | ||
231 | +2) create the configuration file '/etc/conf.d/ecryptfs' and set the ECRYPTFSKEY | ||
232 | variable; | ||
233 | |||
234 | 3) specify the eCryptfs key path name in the 'ecryptfskey=' parameter of the kernel command | ||
235 | line. | ||
236 | |||
237 | -# The configuration file '/etc/sysconfig/ecryptfs' is also used to specify | ||
238 | +# The configuration file '/etc/conf.d/ecryptfs' is also used to specify | ||
239 | # more options for mounting the eCryptfs filesystem: | ||
240 | |||
241 | ECRYPTFSSRCDIR: existent directory in the lower root filesystem; | ||
242 | @@ -39,7 +39,7 @@ | ||
243 | option is automatically added by the dracut script). | ||
244 | |||
245 | # Example of the configuration file: | ||
246 | ------------ '/etc/sysconfig/ecryptfs' (with default values) ----------- | ||
247 | +----------- '/etc/conf.d/ecryptfs' (with default values) ----------- | ||
248 | ECRYPTFS_KEY="/etc/keys/ecryptfs-trusted.blob" | ||
249 | ECRYPTFSSRCDIR="/secret" | ||
250 | ECRYPTFSDSTDIR="${ECRYPTFSSRCDIR}" | ||
251 | diff -Naur dracut-018/modules.d/98integrity/evm-enable.sh dracut-018-magellan/modules.d/98integrity/evm-enable.sh | ||
252 | --- dracut-018/modules.d/98integrity/evm-enable.sh 2012-04-05 13:54:38.000000000 +0200 | ||
253 | +++ dracut-018-magellan/modules.d/98integrity/evm-enable.sh 2012-05-07 11:39:56.325982525 +0200 | ||
254 | @@ -9,7 +9,7 @@ | ||
255 | # Roberto Sassu <roberto.sassu@polito.it> | ||
256 | |||
257 | EVMSECFILE="${SECURITYFSDIR}/evm" | ||
258 | -EVMCONFIG="${NEWROOT}/etc/sysconfig/evm" | ||
259 | +EVMCONFIG="${NEWROOT}/etc/conf.d/evm" | ||
260 | EVMKEYDESC="evm-key" | ||
261 | EVMKEYTYPE="encrypted" | ||
262 | EVMKEYID="" | ||
263 | diff -Naur dracut-018/modules.d/98integrity/ima-policy-load.sh dracut-018-magellan/modules.d/98integrity/ima-policy-load.sh | ||
264 | --- dracut-018/modules.d/98integrity/ima-policy-load.sh 2012-04-05 13:54:38.000000000 +0200 | ||
265 | +++ dracut-018-magellan/modules.d/98integrity/ima-policy-load.sh 2012-05-07 11:40:15.726982523 +0200 | ||
266 | @@ -9,8 +9,8 @@ | ||
267 | # Roberto Sassu <roberto.sassu@polito.it> | ||
268 | |||
269 | IMASECDIR="${SECURITYFSDIR}/ima" | ||
270 | -IMACONFIG="${NEWROOT}/etc/sysconfig/ima" | ||
271 | -IMAPOLICY="/etc/sysconfig/ima-policy" | ||
272 | +IMACONFIG="${NEWROOT}/etc/conf.d/ima" | ||
273 | +IMAPOLICY="/etc/conf.d/ima-policy" | ||
274 | |||
275 | load_ima_policy() | ||
276 | { | ||
277 | diff -Naur dracut-018/modules.d/98integrity/README dracut-018-magellan/modules.d/98integrity/README | ||
278 | --- dracut-018/modules.d/98integrity/README 2012-04-05 13:54:38.000000000 +0200 | ||
279 | +++ dracut-018-magellan/modules.d/98integrity/README 2012-05-07 11:40:51.638982523 +0200 | ||
280 | @@ -20,7 +20,7 @@ | ||
281 | EVMKEY="/etc/keys/evm-trusted.blob" | ||
282 | -------------------------------------------------------------------------- | ||
283 | |||
284 | -2) create the configuration file '/etc/sysconfig/evm' and set the EVMKEY variable; | ||
285 | +2) create the configuration file '/etc/conf.d/evm' and set the EVMKEY variable; | ||
286 | |||
287 | 3) specify the EVM key path name in the 'evmkey=' parameter of the kernel command | ||
288 | line. | ||
289 | @@ -33,8 +33,8 @@ | ||
290 | |||
291 | # Save the policy in a file. | ||
292 | |||
293 | -# Create the configuration file '/etc/sysconfig/ima' to override the path name of | ||
294 | +# Create the configuration file '/etc/conf.d/ima' to override the path name of | ||
295 | # the IMA custom policy. | ||
296 | -------------- '/etc/sysconfig/ima' (with the default value) ------------- | ||
297 | -IMAPOLICY="/etc/sysconfig/ima-policy" | ||
298 | +------------- '/etc/conf.d/ima' (with the default value) ------------- | ||
299 | +IMAPOLICY="/etc/conf.d/ima-policy" | ||
300 | ------------------------------------------------------------------------- | ||
301 | diff -Naur dracut-018/modules.d/98usrmount/mount-usr.sh dracut-018-magellan/modules.d/98usrmount/mount-usr.sh | ||
302 | --- dracut-018/modules.d/98usrmount/mount-usr.sh 2012-04-05 13:54:38.000000000 +0200 | ||
303 | +++ dracut-018-magellan/modules.d/98usrmount/mount-usr.sh 2012-05-07 11:41:30.655982522 +0200 | ||
304 | @@ -18,7 +18,7 @@ | ||
305 | if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then | ||
306 | _fsckoptions="-f $_fsckoptions" | ||
307 | elif [ -f "$NEWROOT"/.autofsck ]; then | ||
308 | - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && . "$NEWROOT"/etc/sysconfig/autofsck | ||
309 | + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && . "$NEWROOT"/etc/conf.d/autofsck | ||
310 | if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then | ||
311 | AUTOFSCK_OPT="$AUTOFSCK_OPT -f" | ||
312 | fi | ||
313 | diff -Naur dracut-018/modules.d/99base/mount-hook.sh dracut-018-magellan/modules.d/99base/mount-hook.sh | ||
314 | --- dracut-018/modules.d/99base/mount-hook.sh 2012-04-05 13:54:38.000000000 +0200 | ||
315 | +++ dracut-018-magellan/modules.d/99base/mount-hook.sh 2012-05-07 11:43:07.497982523 +0200 | ||
316 | @@ -42,8 +42,8 @@ | ||
317 | |||
318 | READONLY= | ||
319 | fsckoptions= | ||
320 | - if [ -f "$NEWROOT"/etc/sysconfig/readonly-root ]; then | ||
321 | - . "$NEWROOT"/etc/sysconfig/readonly-root | ||
322 | + if [ -f "$NEWROOT"/etc/conf.d/readonly-root ]; then | ||
323 | + . "$NEWROOT"/etc/conf.d/readonly-root | ||
324 | fi | ||
325 | |||
326 | if getargbool 0 "readonlyroot=" -y readonlyroot; then | ||
327 | @@ -65,7 +65,7 @@ | ||
328 | if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then | ||
329 | fsckoptions="-f $fsckoptions" | ||
330 | elif [ -f "$NEWROOT"/.autofsck ]; then | ||
331 | - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && . "$NEWROOT"/etc/sysconfig/autofsck | ||
332 | + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && . "$NEWROOT"/etc/conf.d/autofsck | ||
333 | if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then | ||
334 | AUTOFSCK_OPT="$AUTOFSCK_OPT -f" | ||
335 | fi |