From fcd3d3c959291bc4b88f3f26c0ec3347a826eb3d Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 11 Jan 2012 13:37:18 +0100 Subject: [PATCH] Use /media instead of /mnt for default mount paths Related to http://bts.grml.org/grml/issue1127 and the according changes in grml-udev-config. --- docs/grml-live-remaster.txt | 4 ++-- docs/grml-live.txt | 4 ++-- etc/grml/fai/config/files/etc/fstab/GRMLBASE | 20 ++++++++++---------- etc/grml/grml-live.conf | 4 ++-- templates/GRML/grml-cheatcodes.txt | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/grml-live-remaster.txt b/docs/grml-live-remaster.txt index 52539b6..1f9b23c 100644 --- a/docs/grml-live-remaster.txt +++ b/docs/grml-live-remaster.txt @@ -29,9 +29,9 @@ need a lot ot RAM. Usage examples -------------- -To live-remaster the system using the partition mounted on /mnt/sda5 invoke: +To live-remaster the system using the partition mounted on /media/sda5 invoke: - # grml-live-remaster /mnt/sda5/grml_remaster_0.1.iso + # grml-live-remaster /media/sda5/grml_remaster_0.1.iso TODO list --------- diff --git a/docs/grml-live.txt b/docs/grml-live.txt index 192aa4c..86dd91e 100644 --- a/docs/grml-live.txt +++ b/docs/grml-live.txt @@ -252,8 +252,8 @@ system: [NOTE] -If you have enough RAM, just run "mount -t tmpfs none /mnt/ramdisk" to get a -tmpfs ("RAMDISK"), and use /mnt/ramdisk as build and output directory - this +If you have enough RAM, just run "mount -t tmpfs none /media/ramdisk" to get a +tmpfs ("RAMDISK"), and use /media/ramdisk as build and output directory - this results in a very fast build process. Note that these files will be gone when rebooting. diff --git a/etc/grml/fai/config/files/etc/fstab/GRMLBASE b/etc/grml/fai/config/files/etc/fstab/GRMLBASE index fb28736..37df293 100644 --- a/etc/grml/fai/config/files/etc/fstab/GRMLBASE +++ b/etc/grml/fai/config/files/etc/fstab/GRMLBASE @@ -5,22 +5,22 @@ # ${GRML_FAI_CONFIG}/config/files/etc/fstab/GRMLBASE # # -proc /proc proc rw,nosuid,nodev,noexec 0 0 -none /proc/bus/usb usbfs defaults,noauto 0 0 -sysfs /sys sysfs rw,nosuid,nodev,noexec 0 0 -devpts /dev/pts devpts noauto,mode=0622 0 0 -/dev/fd0 /mnt/floppy auto user,noauto,exec 0 0 -/dev/external /mnt/external auto user,noauto,exec,rw,uid=USERNAME,gid=USERNAME 0 0 -/dev/external1 /mnt/external1 auto user,noauto,exec,rw,uid=USERNAME,gid=USERNAME 0 0 -/dev/cdrom /mnt/cdrom auto user,noauto,exec,ro 0 0 -/dev/dvd /mnt/dvd auto user,noauto,exec,ro 0 0 +proc /proc proc rw,nosuid,nodev,noexec 0 0 +none /proc/bus/usb usbfs defaults,noauto 0 0 +sysfs /sys sysfs rw,nosuid,nodev,noexec 0 0 +devpts /dev/pts devpts noauto,mode=0622 0 0 +/dev/fd0 /media/floppy auto user,noauto,exec 0 0 +/dev/external /media/external auto user,noauto,exec,rw,uid=USERNAME,gid=USERNAME 0 0 +/dev/external1 /media/external1 auto user,noauto,exec,rw,uid=USERNAME,gid=USERNAME 0 0 +/dev/cdrom /media/cdrom auto user,noauto,exec,ro 0 0 +/dev/dvd /media/dvd auto user,noauto,exec,ro 0 0 # some other examples: # /dev/hda1 /Grml ext3 dev,suid,user,noauto 0 2 # //1.2.3.4/pub /smb/pub smbfs defaults,user,noauto,uid=grml,gid=grml 0 0 # linux:/pub /beer nfs defaults 0 0 # tmpfs /tmp tmpfs size=300M 0 0 # none /proc/bus/usb usbfs defaults,nodev,noexec,nosuid,noauto,devgid=1001,devmode=664 0 0 -# 192.168.1.101:/backups /mnt/nfs nfs defaults,user,wsize=8192,rsize=8192 0 0 +# 192.168.1.101:/backups /media/nfs nfs defaults,user,wsize=8192,rsize=8192 0 0 # # Warning! Please do *not* change any lines below because they are auto-generated by. # If you want to disable rebuildfstab set CONFIG_FSTAB='no' in /etc/grml/autoconfig! diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf index 3923936..ff6fbe0 100644 --- a/etc/grml/grml-live.conf +++ b/etc/grml/grml-live.conf @@ -73,11 +73,11 @@ # Do you want to use a local mirror (like NFS)? # If so specify the directory where debian/ is available: -# MIRROR_DIRECTORY="/mnt/mirror" +# MIRROR_DIRECTORY="/media/mirror" # ... and then set up an according class file in # ${GRML_FAI_CONFIG}/config/files/etc/apt/sources.list.d/ # containing something like: -# deb file:///mnt/mirror/debian sid main contrib non-free +# deb file:///media/mirror/debian sid main contrib non-free # Version number of ISO: # VERSION="0.0-1" diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt index 55da71b..cd8361a 100644 --- a/templates/GRML/grml-cheatcodes.txt +++ b/templates/GRML/grml-cheatcodes.txt @@ -114,7 +114,7 @@ grml tohd=/dev/sda1 Copy Grml's squashfs file to harddisk partit use via "grml bootfrom=/dev/sda1" grml bootfrom=/dev/sda1 Use the squashfs file from directory 'live' of the specified device Setup can be done booting 'grml tohd=/dev/sda1' or - running 'rsync -a --progress /live/image/live /mnt/sda1/' + running 'rsync -a --progress /live/image/live /media/sda1/' grml bootfrom=removable Restrict search for the live media to removable type only. grml bootfrom=removable-usb Restrict search for the live media to usb mass storage only. grml isofrom=/dev/sda1/grml.iso Use specified ISO image for booting -- 2.1.4