Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/dracut/patches/dracut-044-dmsquash-live-root-SQUASHED-can-be-set-earlier.patch

    Contents of /trunk/dracut/patches/dracut-044-dmsquash-live-root-SQUASHED-can-be-set-earlier.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2750 - (show annotations) (download)
    Thu Jan 14 10:48:57 2016 UTC (8 years, 3 months ago) by niro
    File size: 1190 byte(s) 
    -added upstream dmsquash-live-root fixes
    1 From ce9a398771d6e8503d767b450282db52b7a4b482 Mon Sep 17 00:00:00 2001
    2 From: Harald Hoyer <harald@redhat.com>
    3 Date: Tue, 1 Dec 2015 08:52:00 +0100
    4 Subject: dmsquash-live/dmsquash-live-root.sh: SQUASHED can be set earlier
    5
    6 8b5ee88ff667693b2d8da85a8552ad8f5ab95127 removed the check for SQUASHED,
    7 assuming, that the if clause above was the only place, where SQUASHED is
    8 set.
    9
    10 This patch reverts to the old logic, because SQUASHED can be set
    11 earlier.
    12 ---
    13 modules.d/90dmsquash-live/dmsquash-live-root.sh | 3 +++
    14 1 file changed, 3 insertions(+)
    15
    16 diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
    17 index fa44a03..68d076c 100755
    18 --- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
    19 +++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
    20 @@ -203,6 +203,9 @@ fi
    21 # we might have an embedded fs image on squashfs (compressed live)
    22 if [ -e /run/initramfs/live/${live_dir}/${squash_image} ]; then
    23 SQUASHED="/run/initramfs/live/${live_dir}/${squash_image}"
    24 +fi
    25 +
    26 +if [ -e "$SQUASHED" ] ; then
    27 if [ -n "$live_ram" ]; then
    28 echo "Copying live image to RAM..."
    29 echo "(this may take a few minutes)"
    30 --
    31 cgit v0.11.2
    32