merge iso-in/iso-out/images -> iso/images
authorTero Marttila <terom@fixme.fi>
Mon, 30 Jan 2012 13:53:34 +0200
changeset 22 33c9da611479
parent 21 e26b3773ae0e
child 23 a8998bd43467
merge iso-in/iso-out/images -> iso/images
.hgignore
pkvlm-create
--- a/.hgignore	Mon Jan 30 13:41:24 2012 +0200
+++ b/.hgignore	Mon Jan 30 13:53:34 2012 +0200
@@ -1,4 +1,4 @@
 syntax: regexp
 
 \.sw[op]$
-^(images|isos|cds|mnt)/
+^(images|iso|mnt)/
--- a/pkvlm-create	Mon Jan 30 13:41:24 2012 +0200
+++ b/pkvlm-create	Mon Jan 30 13:53:34 2012 +0200
@@ -274,8 +274,8 @@
 ## Installation image
 # Original Debian Installer image (iso)
 INSTALLER_NAME="debian-6.0.3-amd64"
-INSTALLER_ISO="iso-in/${INSTALLER_NAME}-netinst.iso"
-INSTALLER_TREE="iso-in/$INSTALLER_NAME"
+INSTALLER_ISO="iso/${INSTALLER_NAME}-netinst.iso"
+INSTALLER_TREE="images/$INSTALLER_NAME"
 INSTALLER_FLAG="${INSTALLER_TREE}.unpacked"
 
 # Customized preseed image name
@@ -283,7 +283,7 @@
 
 # Customized image content
 INSTALL_TREE="images/${INSTALL_NAME}"
-INSTALL_ISO="iso-out/${INSTALL_NAME}.iso"
+INSTALL_ISO="iso/${INSTALL_NAME}.iso"
 
 
 ### Preseed setup