regenerate

[myplc.git] / build.sh

diff --git a/build.sh b/build.sh
index b3c2c04..6d3733b 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -28,7 +28,7 @@ export PATH
 config=plc_config.xml
 
 # Release and architecture to install
-releasever=2
+releasever=4
 basearch=i386
 
 # Initial size of the image
@@ -116,6 +116,11 @@ install -D -m 755 plc_config.py $root/tmp/plc_config.py
 chroot $root sh -c 'cd /tmp; python plc_config.py build; python plc_config.py install'
 install -D -m 755 plc-config $root/usr/bin/plc-config
 install -D -m 755 api-config $root/usr/bin/api-config
+install -D -m 755 db-config $root/usr/bin/db-config
+install -D -m 755 dns-config $root/usr/bin/dns-config
+
+# Install OpenSSL configuration
+install -D -m 644 openssl.cnf $root/etc/planetlab/ssl/openssl.cnf
 
 # Install initscripts
 echo "* Installing initscripts"
@@ -273,6 +278,7 @@ rm -f $data/var/www/html/download/*.{iso,usb}
 RETVAL=$(($RETVAL+$?))
 
 # Restore default configuration
-rm -f $data/etc/planetlab/plc_config.xml $data/etc/planetlab/configs/bootstrap.xml
+rm -f $data/etc/planetlab/configs/bootstrap.xml
+install -D -m 444 $config $data/etc/planetlab/plc_config.xml
 
 exit $RETVAL