Skip to content

Commit

Permalink
Switch default mount point from /lib/live/mount/medium to /run/live/m…
Browse files Browse the repository at this point in the history
…edium

In commit 0d878d3a679 of live-boot(-grml)
("Simplify mount point handling by using /run/live instead of /lib/live/mount")
the mountpath of /lib/live/mount/medium was moved towards /run/live/medium.

Commit c6a17c7b41b of live-boot(-grml) provides a backward compatibility
rbind mount, but occasionally there seems to be a regression somewhere
during boot (see grml/live-boot-grml#10), and
the rbind mount will be deprecated and removed before the bullseye
(Debian 11) release.

Layout changes over time:

* /cdrom for old linuxrc approach
* /live/image for initramfs layout until December 2012
* /lib/live/mount/medium for initramfs layout since December 2012
* /run/live/medium for initramfs layout since December 2018
  • Loading branch information
mika committed Mar 21, 2019
1 parent 5d8f070 commit 95b0773
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion debian/control
Expand Up @@ -30,4 +30,4 @@ Recommends: syslinux,
Description: install Grml system / ISO to usb device
This script installs a Grml ISO to an USB device to be able
to boot from it. Make sure you have at least one Grml ISO
or a running Grml system (/lib/live/mount/medium) available.
or a running Grml system (/run/live/medium) available.
8 changes: 4 additions & 4 deletions grml2usb
Expand Up @@ -69,10 +69,10 @@ def grub_option(option, opt, value, opt_parser):


# cmdline parsing
USAGE = "Usage: %prog [options] <[ISO[s] | /lib/live/mount/medium]> </dev/sdX#>\n\
USAGE = "Usage: %prog [options] <[ISO[s] | /run/live/medium]> </dev/sdX#>\n\
\n\
%prog installs Grml ISO[s] to an USB device to be able to boot from it.\n\
Make sure you have at least one Grml ISO or a running Grml system (/lib/live/mount/medium),\n\
Make sure you have at least one Grml ISO or a running Grml system (/run/live/medium),\n\
grub or syslinux and root access.\n\
\n\
Run %prog --help for usage hints, further information via: man grml2usb"
Expand Down Expand Up @@ -1227,7 +1227,7 @@ def identify_grml_flavour(mountpath):
version_files = search_file('grml-version', mountpath, lst_return=True)

if not version_files:
if mountpath.startswith("/lib/live/mount/medium"):
if mountpath.startswith("/run/live/medium"):
logging.critical("Error: could not find grml-version file.")
logging.critical("Looks like your system is running from RAM but required files are not available.")
logging.critical("Please either boot without toram=... or use boot option toram instead of toram=...")
Expand Down Expand Up @@ -1628,7 +1628,7 @@ def install(image, device):
def install_grml(mountpoint, device):
"""Main logic for copying files of the currently running Grml system.
@mountpoint: directory where currently running live system resides (usually /lib/live/mount/medium)
@mountpoint: directory where currently running live system resides (usually /run/live/medium)
@device: partition where the specified ISO should be installed to"""

device_mountpoint = device
Expand Down
6 changes: 3 additions & 3 deletions grml2usb.8.txt
Expand Up @@ -37,7 +37,7 @@ Options
-------

ISO[s] should be the path to one or multiple grml-ISOs and/or the path to
the currently running live-system (being /lib/live/mount/medium).
the currently running live-system (being /run/live/medium).

The device either might be a device name like /dev/sdX1 or a directory. When
specifying a device name the device is mounted automatically. When specifying a
Expand Down Expand Up @@ -580,11 +580,11 @@ Install specified ISO on device /dev/sdX1.

Install specified ISOs on device /dev/sdX1 for multibooting ISOs.

# grml2usb /lib/live/mount/medium /dev/sdX1
# grml2usb /run/live/medium /dev/sdX1

Install currently running Grml live system on device /dev/sdX1.

# grml2usb /lib/live/mount/medium /home/grml/grml64-full_2018.12.iso /dev/sdX1
# grml2usb /run/live/medium /home/grml/grml64-full_2018.12.iso /dev/sdX1

Install currently running Grml live system and the specified
ISO on device /dev/sdX1 for multibooting.
Expand Down
2 changes: 1 addition & 1 deletion zsh/_grml2usb
Expand Up @@ -21,7 +21,7 @@ done
# TODO:
# * handling of --bootoptions=BOOTOPTIONS
# * $devices should also list directories as valid target
# * as output before :device:.... ISO files and/or /lib/live/mount/medium should be suggested
# * as output before :device:.... ISO files and/or /run/live/medium should be suggested

arguments=(
'--help[display help message and exit]:'
Expand Down

0 comments on commit 95b0773

Please sign in to comment.