summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-12-15 18:22:42 +0000
committerOlivier Blin <oblin@mandriva.org>2005-12-15 18:22:42 +0000
commitd252b22a433a31a73f199ec015d038978390ca29 (patch)
tree6f7314bfbf1f4b52dcd3cb0d5f20ac54eb67c37e
parent444f9e46d1ef816dcceb53f7055e7bb24cef81ad (diff)
downloaddrakx-d252b22a433a31a73f199ec015d038978390ca29.tar
drakx-d252b22a433a31a73f199ec015d038978390ca29.tar.gz
drakx-d252b22a433a31a73f199ec015d038978390ca29.tar.bz2
drakx-d252b22a433a31a73f199ec015d038978390ca29.tar.xz
drakx-d252b22a433a31a73f199ec015d038978390ca29.zip
cdrom must be mounted read-only
-rwxr-xr-xtools/draklive2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/draklive b/tools/draklive
index 335225f50..60ccfdb93 100755
--- a/tools/draklive
+++ b/tools/draklive
@@ -224,6 +224,7 @@ my %overlay = (
my %storage = (
cdrom => {
+ read_only => 1,
modules => 'disk/cdrom|hardware_raid|sata|scsi bus/usb disk/raw',
},
usb => {
@@ -338,6 +339,7 @@ sub create_initrd_linuxrc {
if_($live->{debug}, "/bin/sh"),
if_($live->{media}{pre}, deref_array($live->{media}{pre})),
($live->{media}{fs} eq 'nfs' ? '/bin/mount -n -o ro,nolock' : 'mount') .
+ ($storage{$live->{media}{storage}}{read_only} && " -o ro") .
" -t $live->{media}{fs} $live->{media}{source} $live->{media}{mountpoint}",
(map { $loop{$_->{type}}{mount}->($live, $_) } grep { $_->{type} } @{$live->{mount}{dirs} || []}),
($live->{mount}{overlay} ? $overlay{$live->{mount}{overlay}}{mount}->($live) : ()),