diff options
author | imp <imp@FreeBSD.org> | 2014-08-14 16:17:30 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2014-08-14 16:17:30 +0000 |
commit | 055e170112743801bdd9f2f8f0f440f47f2fd793 (patch) | |
tree | 079659e2acb2e3656a9fd765a10cb365b4e9ab3e /tools | |
parent | 85d1111448a1e8857f3aae02e22266689384c10d (diff) | |
download | FreeBSD-src-055e170112743801bdd9f2f8f0f440f47f2fd793.zip FreeBSD-src-055e170112743801bdd9f2f8f0f440f47f2fd793.tar.gz |
create_$ARCH_diskimage never really took off. Collapse back down to
just one.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/tools/nanobsd/dhcpd/common | 5 | ||||
-rw-r--r-- | tools/tools/nanobsd/nanobsd.sh | 9 | ||||
-rw-r--r-- | tools/tools/nanobsd/rescue/common | 8 |
3 files changed, 2 insertions, 20 deletions
diff --git a/tools/tools/nanobsd/dhcpd/common b/tools/tools/nanobsd/dhcpd/common index 412c1a1..2658a84 100644 --- a/tools/tools/nanobsd/dhcpd/common +++ b/tools/tools/nanobsd/dhcpd/common @@ -261,11 +261,6 @@ die() exit 1 } -create_amd64_diskimage() -{ - create_i386_diskimage "$*" -} - # Automatically include the packaging port here so it is always first so it # builds the port and adds the package so we can add other packages. add_port ports-mgmt/pkg diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh index 4f58da4..5d1f5cd 100644 --- a/tools/tools/nanobsd/nanobsd.sh +++ b/tools/tools/nanobsd/nanobsd.sh @@ -487,7 +487,7 @@ populate_data_slice ( ) ( populate_slice "$1" "$2" "$3" "$4" ) -create_i386_diskimage ( ) ( +create_diskimage ( ) ( pprint 2 "build diskimage" pprint 3 "log: ${NANO_OBJ}/_.di" @@ -649,11 +649,6 @@ create_i386_diskimage ( ) ( ) > ${NANO_OBJ}/_.di 2>&1 ) -# i386 and amd64 are identical for disk images -create_amd64_diskimage ( ) ( - create_i386_diskimage -) - last_orders () ( # Redefine this function with any last orders you may have # after the build completed, for instance to copy the finished @@ -1106,7 +1101,7 @@ setup_nanobsd prune_usr run_late_customize if $do_image ; then - create_${NANO_ARCH}_diskimage + create_diskimage else pprint 2 "Skipping image build (as instructed)" fi diff --git a/tools/tools/nanobsd/rescue/common b/tools/tools/nanobsd/rescue/common index c432440..3fd06c8 100644 --- a/tools/tools/nanobsd/rescue/common +++ b/tools/tools/nanobsd/rescue/common @@ -106,11 +106,3 @@ last_orders () ( -o bootimage="i386;_.w/boot/cdboot" -o no-emul-boot _.disk.iso _.w/ ) ) - -#create_i386_diskimage () { -# #currently not used -#} - -#create_amd64_diskimage () { -# create_i386_diskimage -#} |