carbon-config

commit 196d1c22416bf7d2607ba20cb416fa55440e7dab
parent 2938a851c2eeac2336e093fe72430100f9c0773d
Author: ccx <root@dorje.wpr.cz>
Date:   Fri, 16 Sep 2022 12:26:40 +0200

Mount /mnt/mmc read-only

Diffstat:
M
fs
 | 
13
+------------
M
s6-rc.fileset
 | 
4
++--
M
static/etc/fstab
 | 
2
+-

3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/fs b/fs
@@ -65,17 +65,6 @@
 
 # ---
 
-
-#/media/cdrom
-#	source=/dev/cdrom
-#	type=iso9660
-#	options=noauto,ro
-#
-#/media/usb
-#	source=/dev/usbdisk
-#	type=vfat
-#	options=noauto,ro
-
 #none
 #	source=/dev/mapper/vg-swap
 #	type=swap
@@ -102,7 +91,7 @@
 /mnt/mmc
 	source=/dev/mmcblk0p1
 	type=vfat
-	options=iocharset=utf8
+	options=ro,iocharset=utf8
 	bundles=ok-localmount
 
 /mnt/volumes/video
diff --git a/s6-rc.fileset b/s6-rc.fileset
@@ -125,8 +125,8 @@ m644
 /mount-mnt-mmc/up
 CN	# mount /dev/mmcblk0p1 on /mnt/mmc
 	if { mkdir -p "/mnt/mmc" }
-	if -n -t { mount -t "vfat" -o "remount,iocharset=utf8" "/dev/mmcblk0p1" "/mnt/mmc" }
-	mount -t "vfat" -o "iocharset=utf8" "/dev/mmcblk0p1" "/mnt/mmc"
+	if -n -t { mount -t "vfat" -o "remount,ro,iocharset=utf8" "/dev/mmcblk0p1" "/mnt/mmc" }
+	mount -t "vfat" -o "ro,iocharset=utf8" "/dev/mmcblk0p1" "/mnt/mmc"
 /mount-mnt-volumes-video	d	m755
 /mount-mnt-volumes-video/dependencies
 CN	rootfs
diff --git a/static/etc/fstab b/static/etc/fstab
@@ -9,7 +9,7 @@ none	/run/cgroup2	cgroup2	rw	0 0
 /dev/sda1	/boot	ext3	ro,nosuid	0 0
 /dev/mapper/vg-home	/home	ext4	noatime,nosuid	0 0
 /boot/sysrcd.dat	/mnt/sysrcd	squashfs	ro,loop,nosuid	0 0
-/dev/mmcblk0p1	/mnt/mmc	vfat	iocharset=utf8	0 0
+/dev/mmcblk0p1	/mnt/mmc	vfat	ro,iocharset=utf8	0 0
 /dev/mapper/vg-video	/mnt/volumes/video	xfs	noatime,nosuid	0 0
 /dev/mapper/vg-audio	/mnt/volumes/audio	xfs	noatime,nosuid	0 0
 /dev/mapper/vg-photos	/mnt/volumes/photos	xfs	noatime,nosuid	0 0