cleanup ctd
Thierry Parmentelat [Thu, 2 Oct 2008 06:47:52 +0000 (06:47 +0000)]
21 files changed:
bootme_old/BOOTPORT [deleted file]
bootme_old/BOOTSERVER [deleted file]
bootme_old/BOOTSERVER_IP [deleted file]
bootme_old/ID [deleted file]
bootme_old/cacert/README [deleted file]
bootme_old/cacert/boot.planet-lab.org/cacert.pem [deleted file]
bootme_old/cacert/boot1.planet-lab.org/cacert.pem [deleted file]
bootme_old/cacert/boot2.planet-lab.org/cacert.pem [deleted file]
bootme_old/cacert/boot3.planet-lab.org/cacert.pem [deleted file]
bootme_old/cacert/boot4.planet-lab.org/cacert.pem [deleted file]
bootme_old/cacert/boot5.planet-lab.org/cacert.pem [deleted file]
bootme_old/cacert/boot6.planet-lab.org/cacert.pem [deleted file]
bootme_old/cacert/boot7.planet-lab.org/cacert.pem [deleted file]
bootme_old/cacert/boot8.planet-lab.org/cacert.pem [deleted file]
bootme_old/cacert/boot9.planet-lab.org/cacert.pem [deleted file]
conf_files/isolinux.cfg [deleted file]
conf_files/macros [deleted file]
conf_files/pl_hwinit
conf_files/pl_netinit
conf_files/pl_sysinit
prep.sh

diff --git a/bootme_old/BOOTPORT b/bootme_old/BOOTPORT
deleted file mode 100644 (file)
index 5246073..0000000
+++ /dev/null
@@ -1 +0,0 @@
-8888
diff --git a/bootme_old/BOOTSERVER b/bootme_old/BOOTSERVER
deleted file mode 100644 (file)
index e5fddb1..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-boot.planet-lab.org
-boot1.planet-lab.org
-boot2.planet-lab.org
-boot3.planet-lab.org
-boot4.planet-lab.org
-boot5.planet-lab.org
-boot6.planet-lab.org
-boot7.planet-lab.org
-boot8.planet-lab.org
-boot9.planet-lab.org
diff --git a/bootme_old/BOOTSERVER_IP b/bootme_old/BOOTSERVER_IP
deleted file mode 100644 (file)
index 394746d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-128.232.8.3
diff --git a/bootme_old/ID b/bootme_old/ID
deleted file mode 100644 (file)
index 051ada1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-PlanetLab BootCD v2.0.3
diff --git a/bootme_old/cacert/README b/bootme_old/cacert/README
deleted file mode 100644 (file)
index 8e52f4c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-These are the public certificates for the PlanetLab boot
-servers.
diff --git a/bootme_old/cacert/boot.planet-lab.org/cacert.pem b/bootme_old/cacert/boot.planet-lab.org/cacert.pem
deleted file mode 100755 (executable)
index 840cb29..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC7DCCAlWgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBoTELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCk5ldyBKZXJzZXkxEjAQBgNVBAcTCVByaW5jZXRvbjESMBAGA1UE
-ChMJUGxhbmV0TGFiMRIwEAYDVQQLEwlQbGFuZXRMYWIxGjAYBgNVBAMTEVBsYW5l
-dExhYiBSb290IENBMSUwIwYJKoZIhvcNAQkBFhZzdXBwb3J0QHBsYW5ldC1sYWIu
-b3JnMB4XDTA0MDIyMzE4MTMyMloXDTE0MDIyMDE4MTMyMlowgaExCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRIwEAYDVQQHEwlQcmluY2V0b24xEjAQ
-BgNVBAoTCVBsYW5ldExhYjESMBAGA1UECxMJUGxhbmV0TGFiMRowGAYDVQQDExFQ
-bGFuZXRMYWIgUm9vdCBDQTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBwbGFuZXQt
-bGFiLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwtpNRNvNmIEX0zDu
-JcMc3zLHZz9LuXjH+UqiktPIfiMhh1sUqZE2wDfppcGRLAdC7mrmZys5GjZTO0nf
-bU/rV73hplTD8UPZojpbcvKLm5t0kocDG4aoUL+vDF7T8UlXl/T5UF0GWqFey9UY
-luCI5UeKMYdyoxhaMGiL8IBK8DUCAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQU+DhxfTWp4xeIF2lUWngDOhC1lY8wDQYJKoZIhvcNAQEEBQADgYEA
-qYakXhLdtk64ppM1KmjeD0M0bGU+ZFu421MH0whxv5RROgNEwCxXicbD/9FZ2uzo
-ik7AdBAiZiyvoEkTxYkzpXHkdM6x0j6iDMjomtihUgkjtM+xaiQ6lqy9h583zhjg
-2Te0bEteMD8w8zT3Vdg8AsOPsDRZgHS3TMmTSzDg6nI=
------END CERTIFICATE-----
diff --git a/bootme_old/cacert/boot1.planet-lab.org/cacert.pem b/bootme_old/cacert/boot1.planet-lab.org/cacert.pem
deleted file mode 100755 (executable)
index 12ff1ab..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC7DCCAlWgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBoTELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCk5ldyBKZXJzZXkxEjAQBgNVBAcTCVByaW5jZXRvbjESMBAGA1UE
-ChMJUGxhbmV0TGFiMRIwEAYDVQQLEwlQbGFuZXRMYWIxGjAYBgNVBAMTEVBsYW5l
-dExhYiBSb290IENBMSUwIwYJKoZIhvcNAQkBFhZzdXBwb3J0QHBsYW5ldC1sYWIu
-b3JnMB4XDTA0MDIyMzE4MjAyNVoXDTE0MDIyMDE4MjAyNVowgaExCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRIwEAYDVQQHEwlQcmluY2V0b24xEjAQ
-BgNVBAoTCVBsYW5ldExhYjESMBAGA1UECxMJUGxhbmV0TGFiMRowGAYDVQQDExFQ
-bGFuZXRMYWIgUm9vdCBDQTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBwbGFuZXQt
-bGFiLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqTbodSr8D8MMbAaN
-HRmH7F7N786hkUEmNGKmY/3vL43O1pece6pTRhnxG1nzn2KXPJpFAUkPA0tEwIWd
-3FaSrk2HdbUAEzLEYnKmsuFfdsgN2P6BKapmBGdr2cx5zMBSW+TF4YQ5CQi14tCg
-n9xlKahmXzeTdpVp/EF71bjBZgECAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUk0NbbylUNeZdRtlMwFg3Yy94kk4wDQYJKoZIhvcNAQEEBQADgYEA
-poFwjOngxcsOu8FclBnezjdmW15mwBPDEU2hAsV6QeXvGzrP46lPz+dmRUysM0te
-LUl9KnzWvRvjL+gOa4YnHtjzzTNH8fgGDShu/2/9oCROXEqR+xcn7oty6wN87htQ
-TgQrffnF6NfjYTEFVmrklG32JBOElUtP/nOGFcKjSw0=
------END CERTIFICATE-----
diff --git a/bootme_old/cacert/boot2.planet-lab.org/cacert.pem b/bootme_old/cacert/boot2.planet-lab.org/cacert.pem
deleted file mode 100755 (executable)
index aabd879..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC7DCCAlWgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBoTELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCk5ldyBKZXJzZXkxEjAQBgNVBAcTCVByaW5jZXRvbjESMBAGA1UE
-ChMJUGxhbmV0TGFiMRIwEAYDVQQLEwlQbGFuZXRMYWIxGjAYBgNVBAMTEVBsYW5l
-dExhYiBSb290IENBMSUwIwYJKoZIhvcNAQkBFhZzdXBwb3J0QHBsYW5ldC1sYWIu
-b3JnMB4XDTA0MDIyMzE4MjIzMVoXDTE0MDIyMDE4MjIzMVowgaExCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRIwEAYDVQQHEwlQcmluY2V0b24xEjAQ
-BgNVBAoTCVBsYW5ldExhYjESMBAGA1UECxMJUGxhbmV0TGFiMRowGAYDVQQDExFQ
-bGFuZXRMYWIgUm9vdCBDQTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBwbGFuZXQt
-bGFiLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAot5fQ+cQ+buOhh6O
-NCgKPXP1F0yd+Z5bfeY1N8+fjogst8/Lxg+FLWh+CBgLIw4UKGprkSXx4S0KOSU/
-f/Nh641cCwFdunS0DgYKmei3V8wYj2dCLHXuxugjWP7ZNAIxD4GeDpn/iLEdqbV8
-j1FPlm4O0tVsnvpme0nmhu+fTr8CAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUpyxdGDqh4SXJjhs7WNllAJF1sfgwDQYJKoZIhvcNAQEEBQADgYEA
-hqXE1BkcXTZF0l0uZavmfQYpGbrNXPYDax0I98l7zOAQEedH5Uk5eSGguWpsKb9k
-yj/5liuKU+09yFPjO8GpCbh+QONn0I7ZhafOQMMDoMBcBaZdo9yTBWoQ2fL6Wkv1
-ZchZXYiYcmVxdKVpM25yNQ9Jv/lYVqhfQ7bz90jeQ0g=
------END CERTIFICATE-----
diff --git a/bootme_old/cacert/boot3.planet-lab.org/cacert.pem b/bootme_old/cacert/boot3.planet-lab.org/cacert.pem
deleted file mode 100755 (executable)
index 1ef24bd..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC7DCCAlWgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBoTELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCk5ldyBKZXJzZXkxEjAQBgNVBAcTCVByaW5jZXRvbjESMBAGA1UE
-ChMJUGxhbmV0TGFiMRIwEAYDVQQLEwlQbGFuZXRMYWIxGjAYBgNVBAMTEVBsYW5l
-dExhYiBSb290IENBMSUwIwYJKoZIhvcNAQkBFhZzdXBwb3J0QHBsYW5ldC1sYWIu
-b3JnMB4XDTA0MDIyMzE4MjUzNFoXDTE0MDIyMDE4MjUzNFowgaExCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRIwEAYDVQQHEwlQcmluY2V0b24xEjAQ
-BgNVBAoTCVBsYW5ldExhYjESMBAGA1UECxMJUGxhbmV0TGFiMRowGAYDVQQDExFQ
-bGFuZXRMYWIgUm9vdCBDQTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBwbGFuZXQt
-bGFiLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2kXLgHuVbEsoejzA
-DdFnOospL9fLVrjpPyIH3SMaX2rb8YILmGdXESKOn5GmNMAw8RfJF9n5WnSzOvq9
-JEJIW7QSVtvmqdk3H8appdIXamwejegbeXq0PdQUVwvAJsJ38wHHneZRz6DOTZ9v
-tBaBw4FncPhxj3+3U/S4k0uHGAkCAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQU1N5lgwqJfTJPapbgeezC8EiQh50wDQYJKoZIhvcNAQEEBQADgYEA
-OTdhMwA2Zz6wtcwic0AboECwpvjqOWqTqymv17PikFLWLu7wbP2dzy2ZheCNUYXu
-fKNyYN6WBknvAeE8tTZLXDQw36Vns+I6MYMjwXhJHZzU8tbgr2DcqyupdesZ/wSy
-LZswz8taJZtSEieexdvSfU4I51aNbTW146laaKxBnq4=
------END CERTIFICATE-----
diff --git a/bootme_old/cacert/boot4.planet-lab.org/cacert.pem b/bootme_old/cacert/boot4.planet-lab.org/cacert.pem
deleted file mode 100755 (executable)
index aa83e2c..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC7DCCAlWgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBoTELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCk5ldyBKZXJzZXkxEjAQBgNVBAcTCVByaW5jZXRvbjESMBAGA1UE
-ChMJUGxhbmV0TGFiMRIwEAYDVQQLEwlQbGFuZXRMYWIxGjAYBgNVBAMTEVBsYW5l
-dExhYiBSb290IENBMSUwIwYJKoZIhvcNAQkBFhZzdXBwb3J0QHBsYW5ldC1sYWIu
-b3JnMB4XDTA0MDIyMzE4MzE1M1oXDTE0MDIyMDE4MzE1M1owgaExCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRIwEAYDVQQHEwlQcmluY2V0b24xEjAQ
-BgNVBAoTCVBsYW5ldExhYjESMBAGA1UECxMJUGxhbmV0TGFiMRowGAYDVQQDExFQ
-bGFuZXRMYWIgUm9vdCBDQTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBwbGFuZXQt
-bGFiLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvKSR85jruJVfqFT4
-tgafnu4RGd9Vyltnpb09ousQqzFEdo9pMAAAFLCsP3v8BZ+tMLZlQPtbQcv444rt
-3iVOSdvGS9csDT18k9m+TNQoPFu7vZfJZjNFLxShhw6Uz258OrNYADbJ9n6cMESk
-wvGJBFU22z46qp0vwb0K5b9eURUCAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUM5wpj7MPC6x0inb5/GEBTB7/v64wDQYJKoZIhvcNAQEEBQADgYEA
-j15uR4OYEbE6moz77Xx+B1t5DgVPsej5QyrYal/g4S6Z2D23dtEYCVkK1sc4+7/w
-d34T1GTkfFFQGlWGsSZozifpokv3htKAoIfmcM1kopSJ7r0VMJSpiWYODdRbdmi1
-kI7if23bOTkbLogQe+3xLOhmPBtDXk24cx8wf7GkAxQ=
------END CERTIFICATE-----
diff --git a/bootme_old/cacert/boot5.planet-lab.org/cacert.pem b/bootme_old/cacert/boot5.planet-lab.org/cacert.pem
deleted file mode 100755 (executable)
index 0e5ef73..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC7DCCAlWgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBoTELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCk5ldyBKZXJzZXkxEjAQBgNVBAcTCVByaW5jZXRvbjESMBAGA1UE
-ChMJUGxhbmV0TGFiMRIwEAYDVQQLEwlQbGFuZXRMYWIxGjAYBgNVBAMTEVBsYW5l
-dExhYiBSb290IENBMSUwIwYJKoZIhvcNAQkBFhZzdXBwb3J0QHBsYW5ldC1sYWIu
-b3JnMB4XDTA0MDIyMzE4MzM1OFoXDTE0MDIyMDE4MzM1OFowgaExCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRIwEAYDVQQHEwlQcmluY2V0b24xEjAQ
-BgNVBAoTCVBsYW5ldExhYjESMBAGA1UECxMJUGxhbmV0TGFiMRowGAYDVQQDExFQ
-bGFuZXRMYWIgUm9vdCBDQTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBwbGFuZXQt
-bGFiLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArT5V6LUbdDHHk0rX
-d+mHs8eyxCsrAALpjW3k6xRJ8bqCPMqGNbkdTKqKwNRC/O5F6T2RrR1bYOCDMt49
-H5PQUJPGu0KE3fgmtp0523SJEvtBdf++p5kb0mzBLy5j0dfGzhxYD7TVvkWOTeFJ
-uwcP58/x1YoZVfoI/gFkr9j6Q7MCAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQU6aBYg5BouMq0eL44ABRD29x9QQgwDQYJKoZIhvcNAQEEBQADgYEA
-hcq7sX4ACsUzz1XSDjcoRK7yLZAlrbb//J5LYBnWF1VRcDEzaV6hIjeXs7f5fz70
-dStF7Ks7O2gg2hFUykt+XjkZVknkMY681aTvscPDl1I4XesNjnOb2jZZ3ciy145Y
-okZ5kO85AG2t9gUiVJoZbC/7cgO8g8uWjaX7OMwCSXw=
------END CERTIFICATE-----
diff --git a/bootme_old/cacert/boot6.planet-lab.org/cacert.pem b/bootme_old/cacert/boot6.planet-lab.org/cacert.pem
deleted file mode 100755 (executable)
index 2298fe5..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC7DCCAlWgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBoTELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCk5ldyBKZXJzZXkxEjAQBgNVBAcTCVByaW5jZXRvbjESMBAGA1UE
-ChMJUGxhbmV0TGFiMRIwEAYDVQQLEwlQbGFuZXRMYWIxGjAYBgNVBAMTEVBsYW5l
-dExhYiBSb290IENBMSUwIwYJKoZIhvcNAQkBFhZzdXBwb3J0QHBsYW5ldC1sYWIu
-b3JnMB4XDTA0MDIyMzE4MzUzNFoXDTE0MDIyMDE4MzUzNFowgaExCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRIwEAYDVQQHEwlQcmluY2V0b24xEjAQ
-BgNVBAoTCVBsYW5ldExhYjESMBAGA1UECxMJUGxhbmV0TGFiMRowGAYDVQQDExFQ
-bGFuZXRMYWIgUm9vdCBDQTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBwbGFuZXQt
-bGFiLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv4pPoW7g6pDCg6n7
-bLGIqP1HMmmxqokDG9baWyEFgOtLKz5gIH7WKM5nZFwivl5wHYlaJWhttrPlXHKE
-aW58PcZ6Wish907HXtjJUnGlG7fyyqg5YbksOfxbfuEeZ17Gt3c974VC1jJhDqAW
-wje0Iy7qIHHy+B3N+FIU/a+eSy8CAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUHXdxNxzh1xWYooXRDO8bh9y9m9UwDQYJKoZIhvcNAQEEBQADgYEA
-DkpX0CFhL10TZKgVbx+vxXpsWoV85XqLKbBP6b4/x7jF57vKI+RJomZ5rNowc73a
-Smw6pMM6NeeaSMzSEhpmOyKsLG2BzpMSxD8KRuSBccLEuPK3oSp6RJ+nX34H/CIi
-Qr+OgcDOwbDgHVBaRm7Tpa2qh7sFli2PTeQN93ooU98=
------END CERTIFICATE-----
diff --git a/bootme_old/cacert/boot7.planet-lab.org/cacert.pem b/bootme_old/cacert/boot7.planet-lab.org/cacert.pem
deleted file mode 100755 (executable)
index 0658305..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC7DCCAlWgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBoTELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCk5ldyBKZXJzZXkxEjAQBgNVBAcTCVByaW5jZXRvbjESMBAGA1UE
-ChMJUGxhbmV0TGFiMRIwEAYDVQQLEwlQbGFuZXRMYWIxGjAYBgNVBAMTEVBsYW5l
-dExhYiBSb290IENBMSUwIwYJKoZIhvcNAQkBFhZzdXBwb3J0QHBsYW5ldC1sYWIu
-b3JnMB4XDTA0MDIyMzE4MzcxMFoXDTE0MDIyMDE4MzcxMFowgaExCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRIwEAYDVQQHEwlQcmluY2V0b24xEjAQ
-BgNVBAoTCVBsYW5ldExhYjESMBAGA1UECxMJUGxhbmV0TGFiMRowGAYDVQQDExFQ
-bGFuZXRMYWIgUm9vdCBDQTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBwbGFuZXQt
-bGFiLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuAATiRIK2Td0NMan
-lDBTjUpRp2F09owqo45xVqyT6uc3awSPQI91wvnBj3sV3jl7CZ0108WaMk2nxbLg
-cvECJNl6cNo/Bt3BKgCjkwggr13iO9QhFavl9gyDHJbGJ7e0PEO1lntfq1QcdVbC
-HfrW4w/EvgsGh5Ej92+xxkUFiiECAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUD59hbDov88r9xJe/pcKd4Hg88c8wDQYJKoZIhvcNAQEEBQADgYEA
-sZGU8Y504Cl49vyaP3hsMOhnDO1/VqA1EtrGqle5FzyQoU1M9lpGOmN3gw4IIsrU
-DcgdXarUS9+k4jZYEbrRve3rHtY3toGTLjZmzD7eIMs1Vb3mYztfTFP1idMPQ+NL
-0NQCRNeFHgOzz4ukcI8RBv+nTfpP0BLDQbA0mDbWzQw=
------END CERTIFICATE-----
diff --git a/bootme_old/cacert/boot8.planet-lab.org/cacert.pem b/bootme_old/cacert/boot8.planet-lab.org/cacert.pem
deleted file mode 100755 (executable)
index 2baf3a5..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC7DCCAlWgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBoTELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCk5ldyBKZXJzZXkxEjAQBgNVBAcTCVByaW5jZXRvbjESMBAGA1UE
-ChMJUGxhbmV0TGFiMRIwEAYDVQQLEwlQbGFuZXRMYWIxGjAYBgNVBAMTEVBsYW5l
-dExhYiBSb290IENBMSUwIwYJKoZIhvcNAQkBFhZzdXBwb3J0QHBsYW5ldC1sYWIu
-b3JnMB4XDTA0MDIyMzE4MzkwNloXDTE0MDIyMDE4MzkwNlowgaExCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRIwEAYDVQQHEwlQcmluY2V0b24xEjAQ
-BgNVBAoTCVBsYW5ldExhYjESMBAGA1UECxMJUGxhbmV0TGFiMRowGAYDVQQDExFQ
-bGFuZXRMYWIgUm9vdCBDQTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBwbGFuZXQt
-bGFiLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1LAFXY5bOaHHB038
-q6l0yvaKixe64vWVI5wVs/Slm0pCLIWuyRoC9E4Dz7bujt+XSTNfi/NSOr0SpaGd
-D3GlinJ/9UXy3EF0au9W5UAA85tyQJlnY4cJJ2qcbiijSnHD1K++Sok1dSljpRL2
-qwvy15MKpUW1hkFDpV2adPqt1i8CAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQU5SGZItRQWq/I0N+DuZGdakMJALowDQYJKoZIhvcNAQEEBQADgYEA
-asXMJtoNaCs5E2AxhTzo4FDPIRFWRtjtoUzsY1Hh0RGwdiuakcR7sTLBRynWnJr/
-GL4N/muj8g4uVdhZA12i6LCkpvG0xgydpPR+/53RMbIfbiVZEMWThMMrrjlZwdEf
-+oJRlkBs43ZYHAhkKG7Ig2ZeHouCGpB+S6+89Jcu5UU=
------END CERTIFICATE-----
diff --git a/bootme_old/cacert/boot9.planet-lab.org/cacert.pem b/bootme_old/cacert/boot9.planet-lab.org/cacert.pem
deleted file mode 100755 (executable)
index 6b80664..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC7DCCAlWgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBoTELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCk5ldyBKZXJzZXkxEjAQBgNVBAcTCVByaW5jZXRvbjESMBAGA1UE
-ChMJUGxhbmV0TGFiMRIwEAYDVQQLEwlQbGFuZXRMYWIxGjAYBgNVBAMTEVBsYW5l
-dExhYiBSb290IENBMSUwIwYJKoZIhvcNAQkBFhZzdXBwb3J0QHBsYW5ldC1sYWIu
-b3JnMB4XDTA0MDIyMzE4NDE0N1oXDTE0MDIyMDE4NDE0N1owgaExCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRIwEAYDVQQHEwlQcmluY2V0b24xEjAQ
-BgNVBAoTCVBsYW5ldExhYjESMBAGA1UECxMJUGxhbmV0TGFiMRowGAYDVQQDExFQ
-bGFuZXRMYWIgUm9vdCBDQTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBwbGFuZXQt
-bGFiLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA13x0Cccrg8MYoqy9
-WU+x0e0SbJndo+NygIJLVlLz9ovUNZwAJ1ch3gKQrCwNwsAGWHb3oh3Djw99v+IO
-4pySWUCBjIERYpC1EVFSpHlBxpSOVe1bEiqC+maaN4Na0nw3eE9P+ntgDWI52JuV
-dG4PTfPkyg49xYYLUf/JVWzD+n8CAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUyHTdaaMClumg/xlCSL99lXKd9f4wDQYJKoZIhvcNAQEEBQADgYEA
-JXwRi59q0Hb+1P8DhxT+e3BLDqA6OVU5/0+z8AWmuSk18NT6cZqR1UDRnOAcvjNG
-FUs9/czEBKg64R5ppq/mUfIKDZjLofwlBJhFS2f6O0E+kDwbevLsf5WdwAEB2Sgn
-+ohps/xW8qcx29GcrztDE/P3XygOpRy8VlKFC65ZP+E=
------END CERTIFICATE-----
diff --git a/conf_files/isolinux.cfg b/conf_files/isolinux.cfg
deleted file mode 100644 (file)
index b257db7..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-DEFAULT kernel
-APPEND load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=0 initrd=initrd.gz root=/dev/ram0 rw
-DISPLAY message.txt
-PROMPT 0
-TIMEOUT 40
diff --git a/conf_files/macros b/conf_files/macros
deleted file mode 100644 (file)
index da310a3..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-%_install_langs en_US:en
-%_excludedocs 1
-%__file_context_path /dev/null
index 225d48b..9f598b8 100755 (executable)
@@ -8,6 +8,10 @@ import time
 
 loadedmodules = None
 
+def now():
+    format="%H:%M:%S(%Z)"
+    return time.strftime(format,time.localtime())
+
 def modprobe(module, args = ""):
     ret = os.system("/sbin/modprobe %s %s" % (module, args))
     if os.WEXITSTATUS(ret) == 0:
@@ -28,7 +32,7 @@ def main(argv):
         path = "/lib/modules/%s/modules.pcimap" % kernel
 
     pcimap = pypcimap.PCIMap(path)
-    print "pl_hwinit: loading applicable modules"
+    print now(),"pl_hwinit: loading applicable modules"
     devices = pypci.get_devices()
     storage_devices = 0
     network_devices = 0
@@ -49,31 +53,31 @@ def main(argv):
 
             # FIXME: This needs improved logic in the case of multiple matching modules
             for module in modules:
-                print "pl_hwinit: found and loading module %s (%s)" % (module, slot)
+                print now(),"pl_hwinit: found and loading module %s (%s)" % (module, slot)
                 modprobe(module)
 
     if network_devices == 0:
-        print "pl_hwinit: no supported network devices found!"
-        print "pl_hwinit: the following devices were found, but have no driver:"
-        print "pl_hwinit: ", "\npl_hwinit: ".join(missing)
+        print now(),"pl_hwinit: no supported network devices found!"
+        print now(),"pl_hwinit: the following devices were found, but have no driver:"
+        print now(),"pl_hwinit: ", "\npl_hwinit: ".join(missing)
 
     # XXX: could check for storage devices too, but older kernels have a lot of that built-in
 
     # sd_mod won't get loaded automatically
-    print "pl_hwinit: loading sd_mod"
+    print now(),"pl_hwinit: loading sd_mod"
     modprobe("sd_mod")
 
     # load usb_storage to support node conf files on flash disks
-    print "pl_hwinit: loading usb_storage"
+    print now(),"pl_hwinit: loading usb_storage"
     modprobe("usb_storage")
 
-    print "pl_hwinit: loading floppy device driver"
+    print now(),"pl_hwinit: loading floppy device driver"
     modprobe("floppy","floppy=0,allowed_drive_mask")
 
     # always wait a bit between loading the usb drivers, and checking /sys/
     # for usb devices (this isn't necessarily for waiting for mass storage files,
     # that is done below)
-    print "pl_hwinit: waiting for usb system to initialize."
+    print now(),"pl_hwinit: waiting for usb system to initialize."
     time.sleep(10)
 
     # sometimes, flash devices take a while to initialize. in fact, the kernel
@@ -114,15 +118,15 @@ def main(argv):
     os.path.walk("/sys/devices", filter_and_add, wait_dev_list)
 
     if len(wait_dev_list) > 0:
-        print "pl_hwinit: found USB mass storage device(s). Attempting to wait"
-        print "pl_hwinit: up to %d seconds for them to come online." % MAX_USB_WAIT_TIME
+        print now(),"pl_hwinit: found USB mass storage device(s). Attempting to wait"
+        print now(),"pl_hwinit: up to %d seconds for them to come online." % MAX_USB_WAIT_TIME
 
         total_wait_time = 0
         success = False
         while total_wait_time < MAX_USB_WAIT_TIME:    
             total_wait_time += PER_CHECK_USB_WAIT_TIME
 
-            print "pl_hwinit: waiting %d seconds." % PER_CHECK_USB_WAIT_TIME
+            print now(),"pl_hwinit: waiting %d seconds." % PER_CHECK_USB_WAIT_TIME
             time.sleep(PER_CHECK_USB_WAIT_TIME)
 
             all_devices_online = True
@@ -132,17 +136,17 @@ def main(argv):
 
             if all_devices_online:
                 success = True
-                print "pl_hwinit: looks like the devices are now online."
+                print now(),"pl_hwinit: looks like the devices are now online."
                 break
             else:
-                print "pl_hwinit: not all devices online yet, waiting..."
+                print now(),"pl_hwinit: not all devices online yet, waiting..."
 
         if success:
-            print "pl_hwinit: Succesfully waited for USB mass storage devices"
-            print "pl_hwinit: to come online."
+            print now(),"pl_hwinit: Succesfully waited for USB mass storage devices"
+            print now(),"pl_hwinit: to come online."
         else:
-            print "pl_hwinit: One or more USB mass storage devices did not"
-            print "pl_hwinit: initialize in time. Continuing anyway."
+            print now(),"pl_hwinit: One or more USB mass storage devices did not"
+            print now(),"pl_hwinit: initialize in time. Continuing anyway."
 
 if __name__ == "__main__":
     main(sys.argv[1:])
index b6c6057..7953dfd 100644 (file)
@@ -58,8 +58,8 @@ DEFAULT_NET_CONF=0
 net_init_failed()
 {
     echo
-    echo "pl_netinit: network initialization failed,"
-    echo "pl_netinit: shutting down machine in two hours"
+    echo $(date "+%H:%M:%S") " pl_netinit: network initialization failed,"
+    echo $(date "+%H:%M:%S") " pl_netinit: shutting down machine in two hours"
     /bin/sleep 2h
     /sbin/shutdown -h now
     exit 1
@@ -86,7 +86,7 @@ find_node_config()
 {
     /bin/rm -f $TMP_OLD_FLOPPY_CONF_FILE 2>&1 > /dev/null
 
-    echo "pl_netinit: looking for node configuration file on floppy"
+    echo $(date "+%H:%M:%S") " pl_netinit: looking for node configuration file on floppy"
     
     /bin/mount -o ro -t $NODE_CONF_DEVICE_FS_TYPES /dev/fd0 \
        $CONF_DEVICE_MOUNT_POINT 2>&1 > /dev/null
@@ -95,7 +95,7 @@ find_node_config()
         # 1. check for new named file first on the floppy disk
        if [ -r "$CONF_DEVICE_MOUNT_POINT/$NEW_NODE_CONF_NAME" ]; then
            conf_file="$CONF_DEVICE_MOUNT_POINT/$NEW_NODE_CONF_NAME"
-           echo "pl_netinit: found node configuration file $conf_file"
+           echo $(date "+%H:%M:%S") " pl_netinit: found node configuration file $conf_file"
            /etc/init.d/pl_validateconf < $conf_file > $USED_NET_CONF
            /bin/umount $CONF_DEVICE_MOUNT_POINT
            return 1
@@ -107,14 +107,14 @@ find_node_config()
        elif [ -r "$CONF_DEVICE_MOUNT_POINT/$OLD_NODE_CONF_NAME" ]; then
            conf_file="$CONF_DEVICE_MOUNT_POINT/$OLD_NODE_CONF_NAME"
            /bin/cp -f $conf_file $TMP_OLD_FLOPPY_CONF_FILE
-           echo "pl_netinit: found old named configuration file, checking later."
+           echo $(date "+%H:%M:%S") " pl_netinit: found old named configuration file, checking later."
        else
-           echo "pl_netinit: floppy mounted, but no configuration file."
+           echo $(date "+%H:%M:%S") " pl_netinit: floppy mounted, but no configuration file."
        fi
 
        /bin/umount $CONF_DEVICE_MOUNT_POINT
     else
-       echo "pl_netinit: no floppy could be mounted, continuing search."
+       echo $(date "+%H:%M:%S") " pl_netinit: no floppy could be mounted, continuing search."
     fi
 
     # 2. check for a new named file on removable flash devices (those 
@@ -122,7 +122,7 @@ find_node_config()
     # to prevent checking normal scsi disks, also make sure
     # /sys/block/<dev>/removable is set to 1
 
-    echo "pl_netinit: looking for node configuration file on flash based devices"
+    echo $(date "+%H:%M:%S") " pl_netinit: looking for node configuration file on flash based devices"
 
     # make the sd* hd* expansion fail to an empty string if there are no sd
     # devices
@@ -138,20 +138,20 @@ find_node_config()
        for partition in $partitions ; do
            check_dev=/dev/$partition
 
-           echo "pl_netinit: looking for node configuration file on device $check_dev"
+           echo $(date "+%H:%M:%S") " pl_netinit: looking for node configuration file on device $check_dev"
            /bin/mount -o ro -t $NODE_CONF_DEVICE_FS_TYPES $check_dev \
                $CONF_DEVICE_MOUNT_POINT 2>&1 > /dev/null
            if [[ $? -eq 0 ]]; then
                if [ -r "$CONF_DEVICE_MOUNT_POINT/$NEW_NODE_CONF_NAME" ]; then
                    conf_file="$CONF_DEVICE_MOUNT_POINT/$NEW_NODE_CONF_NAME"
-                   echo "pl_netinit: found node configuration file $conf_file"
+                   echo $(date "+%H:%M:%S") " pl_netinit: found node configuration file $conf_file"
                    /etc/init.d/pl_validateconf < $conf_file > $USED_NET_CONF
-                   echo "pl_netinit: found configuration"
+                   echo $(date "+%H:%M:%S") " pl_netinit: found configuration"
                    /bin/umount $CONF_DEVICE_MOUNT_POINT
                    return 1
                fi
                
-               echo "pl_netinit: not found"
+               echo $(date "+%H:%M:%S") " pl_netinit: not found"
 
                /bin/umount $CONF_DEVICE_MOUNT_POINT
            fi
@@ -165,27 +165,27 @@ find_node_config()
     # the file $TMP_OLD_FLOPPY_CONF_FILE will be readable.
     if [ -r "$TMP_OLD_FLOPPY_CONF_FILE" ]; then
        conf_file=$TMP_OLD_FLOPPY_CONF_FILE
-       echo "pl_netinit: found node configuration file $conf_file"
+       echo $(date "+%H:%M:%S") " pl_netinit: found node configuration file $conf_file"
        /etc/init.d/pl_validateconf < $conf_file > $USED_NET_CONF
        return 1
     fi
 
 
     # 4. check for plnode.txt on the cd at /usr/boot
-    echo "pl_netinit: looking for network configuration on cd in /usr/boot"
+    echo $(date "+%H:%M:%S") " pl_netinit: looking for network configuration on cd in /usr/boot"
     if [ -r "$CD_NET_CONF_BOOT" ]; then
        
-       echo "pl_netinit: found cd configuration file $CD_NET_BOOT_CONF"
+       echo $(date "+%H:%M:%S") " pl_netinit: found cd configuration file $CD_NET_BOOT_CONF"
        /etc/init.d/pl_validateconf < $CD_NET_CONF_BOOT > $USED_NET_CONF
        return 1
     fi
     
 
     # 5. check for plnode.txt on the cd at /usr
-    echo "pl_netinit: looking for network configuration on cd in /usr"
+    echo $(date "+%H:%M:%S") " pl_netinit: looking for network configuration on cd in /usr"
     if [ -r "$CD_NET_CONF_ROOT" ]; then
        
-       echo "pl_netinit: found cd configuration file $CD_NET_CONF_ROOT"
+       echo $(date "+%H:%M:%S") " pl_netinit: found cd configuration file $CD_NET_CONF_ROOT"
        /etc/init.d/pl_validateconf < $CD_NET_CONF_ROOT > $USED_NET_CONF
        return 1
     fi
@@ -195,9 +195,9 @@ find_node_config()
     # builtin default. this can't be used to install a machine, but
     # will at least let it download and run the boot manager, which
     # can inform the users appropriately.
-    echo "pl_netinit: using default network configuration"
+    echo $(date "+%H:%M:%S") " pl_netinit: using default network configuration"
     if [ -r "$FALLBACK_NET_CONF" ]; then
-       echo "pl_netinit: found cd default configuration file $FALLBACK_NET_CONF"
+       echo $(date "+%H:%M:%S") " pl_netinit: found cd default configuration file $FALLBACK_NET_CONF"
        /etc/init.d/pl_validateconf < $FALLBACK_NET_CONF > $USED_NET_CONF
        DEFAULT_NET_CONF=1
        return 1
@@ -207,15 +207,15 @@ find_node_config()
 }
 
 
-echo "pl_netinit: bringing loopback network device up"
+echo $(date "+%H:%M:%S") " pl_netinit: bringing loopback network device up"
 /sbin/ifconfig lo 127.0.0.1 up
 
 find_node_config
 if [ $? -eq 0 ]; then
     # no network configuration file found. this should not happen as the
     # default cd image has a backup one. halt.
-    echo "pl_netinit: unable to find even a default network configuration"
-    echo "pl_netinit: file, this cd may be corrupt."
+    echo $(date "+%H:%M:%S") " pl_netinit: unable to find even a default network configuration"
+    echo $(date "+%H:%M:%S") " pl_netinit: file, this cd may be corrupt."
     net_init_failed
 fi
 
@@ -225,7 +225,7 @@ fi
 # they will fail (as they should) - but the network will be up if dhcp is
 # available
 
-echo "pl_netinit: loading network configuration"
+echo $(date "+%H:%M:%S") " pl_netinit: loading network configuration"
 . $USED_NET_CONF
 
 if [[ $DEFAULT_NET_CONF -eq 1 ]]; then
@@ -258,14 +258,14 @@ if [[ -n "$NET_DEVICE" ]]; then
        dev_address=`cat $device/address | tr A-Z a-z`
        if [ "$device" == "$NET_DEVICE" -o "$dev_address" == "$NET_DEVICE" ]; then
            ETH_DEVICE=$device
-           echo "pl_netinit: found device $ETH_DEVICE with mac address $dev_address"
+           echo $(date "+%H:%M:%S") " pl_netinit: found device $ETH_DEVICE with mac address $dev_address"
            break
        fi
     done
     popd
 else
     ETH_DEVICE=$DEFAULT_NET_DEV
-    echo "pl_netinit: using default device $ETH_DEVICE"
+    echo $(date "+%H:%M:%S") " pl_netinit: using default device $ETH_DEVICE"
 
 fi
 
@@ -275,9 +275,9 @@ fi
 # of the startup
 
 if [[ -z "$ETH_DEVICE" ]]; then
-    echo "pl_netinit: unable to find a usable device, check to make sure"
-    echo "pl_netinit: the NET_DEVICE field in the configuration file"
-    echo "pl_netinit: cooresponds with a network adapter on this system"
+    echo $(date "+%H:%M:%S") " pl_netinit: unable to find a usable device, check to make sure"
+    echo $(date "+%H:%M:%S") " pl_netinit: the NET_DEVICE field in the configuration file"
+    echo $(date "+%H:%M:%S") " pl_netinit: cooresponds with a network adapter on this system"
     net_init_failed
 fi
 
@@ -285,11 +285,11 @@ fi
 # actually check to make sure ifconfig <device> succeeds
 /sbin/ifconfig $ETH_DEVICE up 2>&1 > /dev/null
 if [[ $? -ne 0 ]]; then
-    echo "pl_netinit: device $ETH_DEVICE does not exist, most likely"
-    echo "pl_netinit: this cd does not have hardware support for your"
-    echo "pl_netinit: network adapter. please send the following lines"
-    echo "pl_netinit: to PlanetLab Support: support@planet-lab.org"
-    echo "pl_netinit: for further assistance"
+    echo $(date "+%H:%M:%S") " pl_netinit: device $ETH_DEVICE does not exist, most likely"
+    echo $(date "+%H:%M:%S") " pl_netinit: this cd does not have hardware support for your"
+    echo $(date "+%H:%M:%S") " pl_netinit: network adapter. please send the following lines"
+    echo $(date "+%H:%M:%S") " pl_netinit: to PlanetLab Support: support@planet-lab.org"
+    echo $(date "+%H:%M:%S") " pl_netinit: for further assistance"
     echo
     /sbin/lspci -n | /bin/grep "Class 0200"    
     echo
@@ -321,7 +321,7 @@ if [ "$IP_METHOD" = "static" ]; then
     /bin/hostname "$HOST_NAME.$DOMAIN_NAME"
 
     if [[ -z "$IP_DNS1" ]]; then
-       echo "pl_netinit: no dns server specified, cannot continue."
+       echo $(date "+%H:%M:%S") " pl_netinit: no dns server specified, cannot continue."
        net_init_failed
     fi
 
@@ -332,11 +332,11 @@ if [ "$IP_METHOD" = "static" ]; then
 fi
 
 
-echo "pl_netinit: attempting to bring up device $ETH_DEVICE"
+echo $(date "+%H:%M:%S") " pl_netinit: attempting to bring up device $ETH_DEVICE"
 /sbin/ifup $ETH_DEVICE
 
 # for backwards compatibility
 /sbin/ifconfig $ETH_DEVICE > $IFCONFIG_OUTPUT
 
-echo "pl_netinit: network online"
+echo $(date "+%H:%M:%S") " pl_netinit: network online"
 
index 266b1d6..0e84fe3 100755 (executable)
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-echo "pl_sysinit: bringing system online"
+echo $(date "+%H:%M:%S") " pl_sysinit: bringing system online"
 
-echo "pl_sysinit: mounting file systems"
+echo $(date "+%H:%M:%S") " pl_sysinit: mounting file systems"
 /bin/mount -v -a
 
-echo "pl_sysinit: starting udevd"
+echo $(date "+%H:%M:%S") " pl_sysinit: starting udevd"
 [ -x /sbin/start_udev ] && /sbin/start_udev
 
-echo "pl_sysinit: invoking hardware initialization script"
+echo $(date "+%H:%M:%S") " pl_sysinit: invoking hardware initialization script"
 /etc/init.d/pl_hwinit
 
 check_initrd()
@@ -50,13 +50,13 @@ check_block_devices()
        if [ "$(cat /sys/block/$device/removable)" = "1" ] ; then
            partitions=$(/bin/awk "\$4 ~ /${device}[0-9]*/ { print \$4 }" /proc/partitions)
            for partition in $partitions ; do
-               echo "pl_sysinit: checking $partition for iso image"
+               echo $(date "+%H:%M:%S") " pl_sysinit: checking $partition for iso image"
                mkdir -p /tmp/$partition
                if /bin/mount -o ro -t msdos,ext2 /dev/$partition /tmp/$partition 2>&1 > /dev/null ; then
                # Look for the first ISO image
                    for iso in /tmp/$partition/*.iso ; do
                        if /sbin/losetup /dev/loop0 $iso ; then
-                           echo "pl_sysinit: using $(basename $iso) on $partition"
+                           echo $(date "+%H:%M:%S") " pl_sysinit: using $(basename $iso) on $partition"
                            device="loop0"
                            break
                        fi
@@ -68,7 +68,7 @@ check_block_devices()
            done
        fi
        
-       echo "pl_sysinit: checking $device for /usr contents"
+       echo $(date "+%H:%M:%S") " pl_sysinit: checking $device for /usr contents"
        /bin/mount -o ro -t iso9660 /dev/$device /usr 2>&1 > /dev/null
        if [ $? -eq 0 ]; then
        # it mounted, but we should probably make sure its our boot cd
@@ -81,7 +81,7 @@ check_block_devices()
            # eh, wrong cd, keep trying
                /bin/umount /usr 2>&1 /dev/null
            else
-               echo "pl_sysinit: found cd and mounted on /usr"
+               echo $(date "+%H:%M:%S") " pl_sysinit: found cd and mounted on /usr"
                _mounted=1
                break
            fi
@@ -90,7 +90,7 @@ check_block_devices()
     return $_mounted
 }
 
-echo "pl_sysinit: finding cd to mount on /usr"
+echo $(date "+%H:%M:%S") " pl_sysinit: finding cd to mount on /usr"
 mounted=0
 check_initrd
 if [ $? -eq 1 ]; then
@@ -102,7 +102,7 @@ else
 fi
 
 if [ $mounted -eq 0 ]; then
-    echo "pl_sysinit: unable to find boot cdrom, cannot continue."
+    echo $(date "+%H:%M:%S") " pl_sysinit: unable to find boot cdrom, cannot continue."
     # todo: maybe we can put a staticly linked sshd here
     /sbin/shutdown -h now
 fi
@@ -111,7 +111,7 @@ fi
 # parts of this were copied from devmap_mknod.sh from the device-mapper
 # source. Since fedora decided not to include it in the rpm, it is 
 # being copied here
-echo "pl_sysinit: creating device mapper control node"
+echo $(date "+%H:%M:%S") " pl_sysinit: creating device mapper control node"
 
 DM_DIR="mapper"
 DM_NAME="device-mapper"
@@ -126,14 +126,14 @@ if [ -n "$MAJOR" ] && [ -n "$MINOR" ]; then
     /bin/rm -f $CONTROL
     /bin/mknod --mode=600 $CONTROL c $MAJOR $MINOR
 else
-    echo "pl_sysinit: unable to create device mapper control node, continuing"
+    echo $(date "+%H:%M:%S") " pl_sysinit: unable to create device mapper control node, continuing"
 fi
 
-echo "pl_sysinit: configuring kernel parameters"
+echo $(date "+%H:%M:%S") " pl_sysinit: configuring kernel parameters"
 /sbin/sysctl -e -p /etc/sysctl.conf
 
-echo "pl_sysinit: bringing network online"
+echo $(date "+%H:%M:%S") " pl_sysinit: bringing network online"
 /etc/init.d/pl_netinit
 
-echo "pl_sysinit: attempting to sync clock"
+echo $(date "+%H:%M:%S") " pl_sysinit: attempting to sync clock"
 /usr/sbin/ntpdate -b -t 10 -u pool.ntp.org
diff --git a/prep.sh b/prep.sh
index 5e9da76..6c58fae 100755 (executable)
--- a/prep.sh
+++ b/prep.sh
@@ -57,13 +57,13 @@ install -D -m 755 ipnmac/ipnmac.x86 $bootcd/usr/sbin/ipnmac
 # Install configuration files
 echo "* Installing configuration files"
 for file in fstab mtab modprobe.conf inittab hosts sysctl.conf ; do
-    install -D -m 644 conf_files/$file $bootcd/etc/$file
+    install -D -m 644 etc/$file $bootcd/etc/$file
 done
 
 # Install initscripts
 echo "* Installing initscripts"
 for file in pl_sysinit pl_hwinit pl_netinit pl_validateconf pl_boot ; do
-    install -D -m 755 conf_files/$file $bootcd/etc/init.d/$file
+    install -D -m 755 initscripts/$file $bootcd/etc/init.d/$file
 done
 
 # Write nodefamily stamp, to help bootmanager do the right thing
@@ -98,12 +98,4 @@ ln -sf /sbin/init $bootcd/init
 echo "* Compressing reference image"
 (cd $bootcd && find . | cpio --quiet -c -o) | gzip -9 > $isofs/bootcd.img
 
-# Build syslinux
-# echo "* Building syslinux"
-# CFLAGS="-Werror -Wno-unused -finline-limit=2000" make -C syslinux
-
-# Install isolinux
-#echo "* Installing isolinux"
-#install -D -m 644 syslinux/isolinux.bin $isofs/isolinux.bin
-
 exit 0