|
Lines 28-34
Link Here
|
| 28 |
start_lvm && |
28 |
start_lvm && |
| 29 |
start_luks && |
29 |
start_luks && |
| 30 |
mount_chroot \ |
30 |
mount_chroot \ |
| 31 |
) >& /tmp/remount.log || return $? |
31 |
) >& /tmp/remount.log |
| 32 |
} |
32 |
} |
| 33 |
|
33 |
|
| 34 |
# avoid automatic rpm shell.req dependency |
34 |
# avoid automatic rpm shell.req dependency |
|
Lines 90-95
Link Here
|
| 90 |
grep " $destdir/" /proc/mounts | |
90 |
grep " $destdir/" /proc/mounts | |
| 91 |
while read dev mnt rest; do umount -v "$mnt"; done |
91 |
while read dev mnt rest; do umount -v "$mnt"; done |
| 92 |
|
92 |
|
|
|
93 |
umount -vl "$destdir/run" ||: |
| 94 |
sleep 1 |
| 93 |
umount -v "$destdir" || return 1 |
95 |
umount -v "$destdir" || return 1 |
| 94 |
} |
96 |
} |
| 95 |
|
97 |
|
|
Lines 101-107
Link Here
|
| 101 |
stop_mdraid() { |
103 |
stop_mdraid() { |
| 102 |
# saving state is only important *after* evms |
104 |
# saving state is only important *after* evms |
| 103 |
if [ -f /proc/mdstat -a -x "$MDADM" ]; then |
105 |
if [ -f /proc/mdstat -a -x "$MDADM" ]; then |
| 104 |
"$MDADM" --examine --scan > /tmp/mdadm.conf |
106 |
"$MDADM" --examine --scan | grep '^ARRAY /dev/md[0-9]' > /tmp/mdadm.conf |
| 105 |
"$MDADM" --stop --scan |
107 |
"$MDADM" --stop --scan |
| 106 |
fi |
108 |
fi |
| 107 |
} |
109 |
} |
|
Lines 131-136
Link Here
|
| 131 |
"$CRYPTSETUP" --key-file "$CRYPTSETUP_KEY" luksOpen "$device" "$(basename "$device")_luks" |
133 |
"$CRYPTSETUP" --key-file "$CRYPTSETUP_KEY" luksOpen "$device" "$(basename "$device")_luks" |
| 132 |
done |
134 |
done |
| 133 |
fi |
135 |
fi |
|
|
136 |
: |
| 134 |
} |
137 |
} |
| 135 |
|
138 |
|
| 136 |
mount_chroot() { |
139 |
mount_chroot() { |
