diff options
| author | Renato Botelho <renato@netgate.com> | 2016-01-13 17:56:30 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-01-13 17:56:30 -0200 |
| commit | 3e0bf52f358eb969d165c4b1e54942ee94cf2c8d (patch) | |
| tree | 440bb9907871a5bc578d65b32f0c4aa339096175 /release | |
| parent | 4b4ac714f11471e43f18410bcc86da8f9dc3b88c (diff) | |
| parent | e357bdb742b2696dcb81404917b6247f9e840232 (diff) | |
| download | FreeBSD-src-3e0bf52f358eb969d165c4b1e54942ee94cf2c8d.zip FreeBSD-src-3e0bf52f358eb969d165c4b1e54942ee94cf2c8d.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 6 | ||||
| -rwxr-xr-x | release/amd64/make-memstick.sh | 2 | ||||
| -rwxr-xr-x | release/amd64/make-uefi-memstick.sh | 2 | ||||
| -rwxr-xr-x | release/i386/make-memstick.sh | 2 | ||||
| -rwxr-xr-x | release/powerpc/make-memstick.sh | 2 |
5 files changed, 13 insertions, 1 deletions
diff --git a/release/Makefile b/release/Makefile index 976f651..a29d84c 100644 --- a/release/Makefile +++ b/release/Makefile @@ -318,7 +318,11 @@ ftp: packagesystem cp *.txz MANIFEST ftp release: real-release vm-release cloudware-release - touch ${.TARGET} + ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} release-done + true + +release-done: + touch release real-release: ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj diff --git a/release/amd64/make-memstick.sh b/release/amd64/make-memstick.sh index e10b892..2dd8372 100755 --- a/release/amd64/make-memstick.sh +++ b/release/amd64/make-memstick.sh @@ -29,12 +29,14 @@ if [ -e ${2} ]; then fi echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab +echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local makefs -B little -o label=FreeBSD_Install ${2} ${1} if [ $? -ne 0 ]; then echo "makefs failed" exit 1 fi rm ${1}/etc/fstab +rm ${1}/etc/rc.conf.local unit=$(mdconfig -a -t vnode -f ${2}) if [ $? -ne 0 ]; then diff --git a/release/amd64/make-uefi-memstick.sh b/release/amd64/make-uefi-memstick.sh index 6c289e0..52e17cc 100755 --- a/release/amd64/make-uefi-memstick.sh +++ b/release/amd64/make-uefi-memstick.sh @@ -29,12 +29,14 @@ if [ -e ${2} ]; then fi echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab +echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local makefs -B little -o label=FreeBSD_Install ${2}.part ${1} if [ $? -ne 0 ]; then echo "makefs failed" exit 1 fi rm ${1}/etc/fstab +rm ${1}/etc/rc.conf.local mkimg -s gpt -b ${1}/boot/pmbr -p efi:=${1}/boot/boot1.efifat -p freebsd-boot:=${1}/boot/gptboot -p freebsd-ufs:=${2}.part -p freebsd-swap::1M -o ${2} rm ${2}.part diff --git a/release/i386/make-memstick.sh b/release/i386/make-memstick.sh index 27979ae7..f824382 100755 --- a/release/i386/make-memstick.sh +++ b/release/i386/make-memstick.sh @@ -29,12 +29,14 @@ if [ -e ${2} ]; then fi echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab +echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local makefs -B little -o label=FreeBSD_Install ${2}.part ${1} if [ $? -ne 0 ]; then echo "makefs failed" exit 1 fi rm ${1}/etc/fstab +rm ${1}/etc/rc.conf.local mkimg -s gpt -b ${1}/boot/pmbr -p freebsd-boot:=${1}/boot/gptboot -p freebsd-ufs:=${2}.part -p freebsd-swap::1M -o ${2} rm ${2}.part diff --git a/release/powerpc/make-memstick.sh b/release/powerpc/make-memstick.sh index 4f6b69d..3c1cfa4 100755 --- a/release/powerpc/make-memstick.sh +++ b/release/powerpc/make-memstick.sh @@ -33,6 +33,7 @@ if [ -e ${2} ]; then fi echo '/dev/da0s3 / ufs ro,noatime 1 1' > ${1}/etc/fstab +echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local rm -f ${tempfile} makefs -B big ${tempfile} ${1} if [ $? -ne 0 ]; then @@ -40,6 +41,7 @@ if [ $? -ne 0 ]; then exit 1 fi rm ${1}/etc/fstab +rm ${1}/etc/rc.conf.local mkimg -s apm -p freebsd-boot:=${1}/boot/boot1.hfs -p freebsd-ufs/FreeBSD_Install:=${tempfile} -o ${2} |
