euhm testing...

1 files changed, 20 insertions, 4 deletions

diff --git a/inc/functions.iso.sh b/inc/functions.iso.sh
index a04cbcd..26e605f 100644
--- a/inc/functions.iso.sh
+++ b/inc/functions.iso.sh
@@ -66,6 +66,7 @@ pre_start_cleanup () {
 setup_dir_structure () {
 	pinfo "Create dir structure."
 	mkdir -p $TMP_DIR/isolinux
+	mkdir -p $TMP_DIR/pbs
 }
 
 copy_files () {
@@ -73,7 +74,7 @@ copy_files () {
 	cp -v $ROOT_DIR/build/kernel-preboot-latest $TMP_DIR/isolinux/kernel
 	
 	cp -v $ROOT_DIR/build/initramfs-default $TMP_DIR/isolinux/initramfs
-	cp -v $ROOT_DIR/build/initramfs-serial $TMP_DIR/isolinux/initramfs-serial
+	cp -v $TMP_DIR/initramfs-serial $TMP_DIR/isolinux/serial
 	
 	cp -v $SYSLINUX/com32/menu/menu.c32 $TMP_DIR/isolinux/
 	cp -v $SYSLINUX/com32/menu/vesamenu.c32 $TMP_DIR/isolinux/
@@ -92,7 +93,7 @@ copy_files () {
 
 }
 
-get_preboot_serials() {
+get_preboot_serial() {
 	
 	pinfo "Retrieving Serials..."
 	
@@ -100,10 +101,23 @@ get_preboot_serials() {
 	wget -qO- pbs2.mp.openslx.org/resource/getprebootserials/apikey/apikey_uni-freiburg | cat
 	set_quiet
 	
-	wget -O serial pbs2.mp.openslx.org/resource/getprebootserials/apikey/apikey_uni-freiburg/serialnr/$NR 
+	pechon "Choose serial to use for the image.\n\tPress the corresponding number, or r for random serial or empty for default serial: "
+	read serial_choice
+	if [ "x$serial_choice" = "xr" ]
+	then
+			: # get random serial from pbs	
+	else
+		wget -O $TMP_DIR/pbs/serial pbs2.mp.openslx.org/resource/getprebootserials/apikey/apikey_uni-freiburg/serialnr/$serial_choice
+	fi	
 	
 }
 
+write_preboot_serial() {
+	cd $TMP_DIR/pbs
+	$ROOT_DIR/bin/build.initramfs-serial.sh
+	cd -
+}
+
 create_iso () {
 	pinfo "Create ISO."
 
@@ -125,7 +139,9 @@ run () {
 	set_quiet
 	
 	pre_start_cleanup
-	setup_dir_structure	
+	setup_dir_structure
+	get_preboot_serial
+	write_preboot_serial	
 	copy_files
 	create_iso