diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mk-images | 1 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index f22763d0a..235f9a1c5 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -650,6 +650,7 @@ makeinstimage () { mkdir -p $mntpoint $tmp mkdir -p $tmp + (cd $IMGPATH; find . | cpio --quiet -p $tmp) makeproductfile $tmp if [ -z "$type" -o "$type" = "cramfs" ]; then diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 20a184fb8..675297da2 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -932,7 +932,7 @@ sed -i "s,^MANPATH_MAP[ \t]*[a-zA-Z0-9/]*[ \t]*,&/mnt/sysimage," $DEST/etc/man.c rm -f $KEEPFILE $KEEPFILERESCUE -echo "Scrubbing trees..." "$DEST" +echo "Scrubbing tree..." "$DEST" mkdir -p $DEST/lib mkdir -p $DEST/firmware ln -snf /modules $DEST/lib/modules @@ -974,11 +974,11 @@ for brokenlink in $(find $DEST/usr/{bin,sbin} -follow -lname '*') ; do target="$(readlink $brokenlink)" for pathbit in bin sbin; do # if it starts with "../../sbin/", remove that - newtarget="${target##../../$DESTathbit/}" + newtarget="${target##../../$pathbit/}" # if we removed something, replace it with the proper path if [ "$newtarget" != "$target" ]; then # make it ../sbin/ instead - ln -sf "../$DESTathbit/$newtarget" "$brokenlink" + ln -sf "../$pathbit/$newtarget" "$brokenlink" fi done done |