Commit 97560dca authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Adding upstream version 4.0~alpha31.

parent 6ed737c9
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -8,5 +8,6 @@
[type: man] en/lb-bootstrap-includes.1 $lang:$lang/lb-bootstrap-includes.$lang.1
[type: man] en/lb-chroot-hooks.1 $lang:$lang/lb-chroot-hooks.$lang.1
[type: man] en/lb-chroot-includes.1 $lang:$lang/lb-chroot-includes.$lang.1
[type: man] en/lb-init.1 $lang:$lang/lb-init.$lang.1
[type: man] en/lb-source-hooks.1 $lang:$lang/lb-source-hooks.$lang.1
[type: man] en/lb-source-includes.1 $lang:$lang/lb-source-includes.$lang.1
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -73,7 +73,7 @@ then
fi
# Handle xorriso generic options
XORRISO_OPTIONS="-r -J -joliet-long -l -cache-inodes"
XORRISO_OPTIONS="-R -r -J -joliet-long -l -cache-inodes"
# Handle xorriso live-build specific options
if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ]
......
......@@ -149,7 +149,7 @@ case "${LB_BUILD_WITH_CHROOT}" in
# Copy in two steps since the theme can have absolute symlinks and would therefore not be dereferenced correctly
cp -a ${_SOURCE} chroot/root
Chroot chroot cp -aL /root/$(basename ${_SOURCE}) /root/$(basename ${_SOURCE}).tmp || true
Chroot chroot cp -aL /root/$(basename ${_SOURCE}) /root/$(basename ${_SOURCE}).tmp > /dev/null 2>&1 || true
cp -a chroot/root/$(basename ${_SOURCE}).tmp/* ${_TARGET}
rm -rf chroot/root/$(basename ${_SOURCE}) chroot/root/$(basename ${_SOURCE}).tmp
;;
......@@ -157,7 +157,7 @@ case "${LB_BUILD_WITH_CHROOT}" in
false)
mkdir -p ${_TARGET}
cp -aL ${_SOURCE}/* ${_TARGET} || true
cp -aL ${_SOURCE}/* ${_TARGET} > /dev/null 2>&1 || true
;;
esac
......
......@@ -67,7 +67,6 @@ do
fi
done
lb chroot_live-packages ${@}
lb chroot-includes ${@}
lb chroot-hooks ${@}
lb chroot_hacks ${@}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment