Merge lp:~xnox/debian-cd/unmkinitramfs-is-available into lp:~ubuntu-cdimage/debian-cd/ubun3

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 2021
Proposed branch: lp:~xnox/debian-cd/unmkinitramfs-is-available
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 13 lines (+1/-2)
1 file modified
tools/add_live_filesystem (+1/-2)
To merge this branch: bzr merge lp:~xnox/debian-cd/unmkinitramfs-is-available
Reviewer Review Type Date Requested Status
Ubuntu CD Image Team Pending
Review via email: mp+364506@code.launchpad.net

Commit message

When traying to operate ubuntu-cdimage/debian-cd on disco, it fails to call unmkinitramfs which is available system wide.

Override PATH variable such that system-wide unmkinitramfs is preferred to the custom deployed one.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/add_live_filesystem'
2--- tools/add_live_filesystem 2019-03-12 08:29:24 +0000
3+++ tools/add_live_filesystem 2019-03-15 15:54:37 +0000
4@@ -90,8 +90,7 @@
5 [ -e "$path" ] || continue
6 mkdir -p "$BDIR/uuid"
7 cd "$BDIR/uuid"
8- # This can be replaced with a call to the system unmkinitramfs later:
9- /home/cdimage/unmkinitramfs $path .
10+ PATH=$PATH:/home/cdimage unmkinitramfs $path .
11 if [ -e conf/uuid.conf ]; then
12 mkdir -p "$BDIR/CD1/.disk"
13 mv conf/uuid.conf "$BDIR/CD1/.disk/casper-uuid-${path#$BDIR/CD1/casper/filesystem.initrd-}"

Subscribers

People subscribed via source and target branches