Page MenuHomeFreeBSD
Files F171962655

D59670.diff
No OneTemporary
Actions

D59670.diff
View Options

diff --git a/release/amd64/make-memstick.sh b/release/amd64/make-memstick.sh
--- a/release/amd64/make-memstick.sh
+++ b/release/amd64/make-memstick.sh
@@ -47,7 +47,14 @@
echo 'root_rw_mount="NO"' > ${BASEBITSDIR}/etc/rc.conf.local
if [ -n "${METALOG}" ]; then
metalogfilename=$(mktemp /tmp/metalog.XXXXXX)
- cat ${METALOG} > ${metalogfilename}
+ # Escape spaces in filenames.
+ awk '{
+ p = index($0, " type=")
+ path = substr($0, 1, p - 1)
+ rest = substr($0, p)
+ gsub(/ /, "\\040", path)
+ print path rest
+ }' ${METALOG} > ${metalogfilename}
echo "./etc/fstab type=file uname=root gname=wheel mode=0644" >> ${metalogfilename}
echo "./etc/rc.conf.local type=file uname=root gname=wheel mode=0644" >> ${metalogfilename}
MAKEFSARG=${metalogfilename}
diff --git a/release/amd64/mkisoimages.sh b/release/amd64/mkisoimages.sh
--- a/release/amd64/mkisoimages.sh
+++ b/release/amd64/mkisoimages.sh
@@ -78,7 +78,14 @@
echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$BASEBITSDIR/etc/fstab"
if [ -n "${METALOG}" ]; then
metalogfilename=$(mktemp /tmp/metalog.XXXXXX)
- cat ${METALOG} > ${metalogfilename}
+ # Escape spaces in filenames.
+ awk '{
+ p = index($0, " type=")
+ path = substr($0, 1, p - 1)
+ rest = substr($0, p)
+ gsub(/ /, "\\040", path)
+ print path rest
+ }' ${METALOG} > ${metalogfilename}
echo "./etc/fstab type=file uname=root gname=wheel mode=0644" >> ${metalogfilename}
MAKEFSARG=${metalogfilename}
fi
diff --git a/release/arm64/make-memstick.sh b/release/arm64/make-memstick.sh
--- a/release/arm64/make-memstick.sh
+++ b/release/arm64/make-memstick.sh
@@ -47,7 +47,14 @@
echo 'root_rw_mount="NO"' > ${BASEBITSDIR}/etc/rc.conf.local
if [ -n "${METALOG}" ]; then
metalogfilename=$(mktemp /tmp/metalog.XXXXXX)
- cat ${METALOG} > ${metalogfilename}
+ # Escape spaces in filenames.
+ awk '{
+ p = index($0, " type=")
+ path = substr($0, 1, p - 1)
+ rest = substr($0, p)
+ gsub(/ /, "\\040", path)
+ print path rest
+ }' ${METALOG} > ${metalogfilename}
echo "./etc/fstab type=file uname=root gname=wheel mode=0644" >> ${metalogfilename}
echo "./etc/rc.conf.local type=file uname=root gname=wheel mode=0644" >> ${metalogfilename}
MAKEFSARG=${metalogfilename}
diff --git a/release/arm64/mkisoimages.sh b/release/arm64/mkisoimages.sh
--- a/release/arm64/mkisoimages.sh
+++ b/release/arm64/mkisoimages.sh
@@ -69,7 +69,14 @@
echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$BASEBITSDIR/etc/fstab"
if [ -n "${METALOG}" ]; then
metalogfilename=$(mktemp /tmp/metalog.XXXXXX)
- cat ${METALOG} > ${metalogfilename}
+ # Escape spaces in filenames.
+ awk '{
+ p = index($0, " type=")
+ path = substr($0, 1, p - 1)
+ rest = substr($0, p)
+ gsub(/ /, "\\040", path)
+ print path rest
+ }' ${METALOG} > ${metalogfilename}
echo "./etc/fstab type=file uname=root gname=wheel mode=0644" >> ${metalogfilename}
MAKEFSARG=${metalogfilename}
fi
diff --git a/release/i386/make-memstick.sh b/release/i386/make-memstick.sh
--- a/release/i386/make-memstick.sh
+++ b/release/i386/make-memstick.sh
@@ -46,7 +46,14 @@
echo 'root_rw_mount="NO"' > ${BASEBITSDIR}/etc/rc.conf.local
if [ -n "${METALOG}" ]; then
metalogfilename=$(mktemp /tmp/metalog.XXXXXX)
- cat ${METALOG} > ${metalogfilename}
+ # Escape spaces in filenames.
+ awk '{
+ p = index($0, " type=")
+ path = substr($0, 1, p - 1)
+ rest = substr($0, p)
+ gsub(/ /, "\\040", path)
+ print path rest
+ }' ${METALOG} > ${metalogfilename}
echo "./etc/fstab type=file uname=root gname=wheel mode=0644" >> ${metalogfilename}
echo "./etc/rc.conf.local type=file uname=root gname=wheel mode=0644" >> ${metalogfilename}
MAKEFSARG=${metalogfilename}
diff --git a/release/i386/mkisoimages.sh b/release/i386/mkisoimages.sh
--- a/release/i386/mkisoimages.sh
+++ b/release/i386/mkisoimages.sh
@@ -66,7 +66,14 @@
echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$BASEBITSDIR/etc/fstab"
if [ -n "${METALOG}" ]; then
metalogfilename=$(mktemp /tmp/metalog.XXXXXX)
- cat ${METALOG} > ${metalogfilename}
+ # Escape spaces in filenames.
+ awk '{
+ p = index($0, " type=")
+ path = substr($0, 1, p - 1)
+ rest = substr($0, p)
+ gsub(/ /, "\\040", path)
+ print path rest
+ }' ${METALOG} > ${metalogfilename}
echo "./etc/fstab type=file uname=root gname=wheel mode=0644" >> ${metalogfilename}
MAKEFSARG=${metalogfilename}
fi

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 15, 11:18 PM (7 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38984251
Default Alt Text
D59670.diff (4 KB)

Event Timeline