]> git.proxmox.com Git - pve-installer.git/commitdiff
move common html file to html-common
authorDietmar Maurer <dietmar@proxmox.com>
Mon, 20 Nov 2017 07:09:39 +0000 (08:09 +0100)
committerDietmar Maurer <dietmar@proxmox.com>
Mon, 20 Nov 2017 07:18:39 +0000 (08:18 +0100)
18 files changed:
Makefile
debian/pve-installer.install [new file with mode: 0644]
html-common/Makefile [new file with mode: 0644]
html-common/country.htm [new file with mode: 0644]
html-common/ipconf.htm [new file with mode: 0644]
html-common/license.htm [new file with mode: 0644]
html-common/nohds.htm [new file with mode: 0644]
html-common/nonics.htm [new file with mode: 0644]
html-common/plus.png [new file with mode: 0644]
html-common/pve-installer.css [new file with mode: 0644]
html/Makefile
html/country.htm [deleted file]
html/ipconf.htm [deleted file]
html/license.htm [deleted file]
html/nohds.htm [deleted file]
html/nonics.htm [deleted file]
html/plus.png [deleted file]
html/pve-installer.css [deleted file]

index 679fcd04dd6759647dcb6647a4691fe8435948fa..2de93820f09d654e63e9e793b911e6d66dec136f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,18 +14,20 @@ INSTALLER_SOURCES=          \
        Xdefaults               \
        proxinstall
 
-HTML_SOURCES=$(wildcard html/*.htm) $(wildcard html/*.css) $(wildcard html/*.png)
+HTML_SOURCES=$(wildcard html/*.htm)
+HTML_COMMON_SOURCES=$(wildcard html-common/*.htm) $(wildcard html-common/*.css) $(wildcard html-common/*.png)
 
 all:
 
 deb: ${DEB}
-${DEB}: ${INSTALLER_SOURCES} ${HTML_SOURCES} Makefile html/Makefile
+${DEB}: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES} Makefile html/Makefile
        rsync -a * build
        cd build; dpkg-buildpackage -b -us -uc
        lintian -X man ${DEB}
 
 .phony: install
-install: ${INSTALLER_SOURCES} ${HTML_SOURCES}
+install: ${INSTALLER_SOURCES} ${HTML_COMMON_SOURCES} ${HTML_SOURCES}
+       make -C html-common install
        make -C html install
        install -D -m 644 interfaces ${DESTDIR}/etc/network/interfaces
        mkdir -p ${DESTDIR}/var/lib/dhcp3/
@@ -33,7 +35,6 @@ install: ${INSTALLER_SOURCES} ${HTML_SOURCES}
        ln -s /tmp/resolv.conf.dhclient-new ${DESTDIR}/etc/resolv.conf.dhclient-new
        install -D -m 755 fake-start-stop-daemon ${DESTDIR}/var/lib/pve-installer/fake-start-stop-daemon
        install -D -m 755 policy-disable-rc.d ${DESTDIR}/var/lib/pve-installer/policy-disable-rc.d
-       install -D -m 644 proxlogo.png  ${DESTDIR}/var/lib/pve-installer/proxlogo.png
        install -D -m 755 unconfigured.sh ${DESTDIR}/sbin/unconfigured.sh
        install -D -m 755 proxinstall ${DESTDIR}/usr/bin/proxinstall
        install -D -m 755 checktime ${DESTDIR}/usr/bin/checktime
@@ -57,6 +58,7 @@ check: packages test.img
 
 .phony: clean
 clean:
+       make -C html-common clean
        make -C html clean
        rm -rf *~ *.deb target build packages packages.tmp test.img pve-final.pkglist *.buildinfo *.changes
        find . -name '*~' -exec rm {} ';'
diff --git a/debian/pve-installer.install b/debian/pve-installer.install
new file mode 100644 (file)
index 0000000..5e33e0b
--- /dev/null
@@ -0,0 +1 @@
+proxlogo.png /var/lib/pve-installer
diff --git a/html-common/Makefile b/html-common/Makefile
new file mode 100644 (file)
index 0000000..1e041d1
--- /dev/null
@@ -0,0 +1,17 @@
+DESTDIR=
+
+all:
+
+.phony: install
+install:
+       install -D -m 644 pve-installer.css ${DESTDIR}/var/lib/pve-installer/html/pve-installer.css
+       install -D -m 644 plus.png ${DESTDIR}/var/lib/pve-installer/html/plus.png
+       install -D -m 644 country.htm ${DESTDIR}/var/lib/pve-installer/html/country.htm
+       install -D -m 644 license.htm ${DESTDIR}/var/lib/pve-installer/html/license.htm
+       install -D -m 644 ipconf.htm ${DESTDIR}/var/lib/pve-installer/html/ipconf.htm
+       install -D -m 644 nohds.htm ${DESTDIR}/var/lib/pve-installer/html/nohds.htm
+       install -D -m 644 nonics.htm ${DESTDIR}/var/lib/pve-installer/html/nonics.htm
+
+.phony: clean
+clean:
+       rm -rf *~
diff --git a/html-common/country.htm b/html-common/country.htm
new file mode 100644 (file)
index 0000000..798e46c
--- /dev/null
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="pve-installer.css">
+</head>
+<body>
+<center>
+<table border="0" width="800">
+<tr><td>&nbsp;</td></tr>
+<tr>
+  <td colspan="4" align="center" width="800">
+    <b class="htext">Location and Time Zone selection</b>
+  </td>
+</tr>
+<tr>
+    <td colspan="2" valign="top" width="400"><br><p>
+    <table>
+      <tr><td><b>The Proxmox Installer</b>
+       automatically makes location based optimizations, like
+       choosing the nearest mirror to download files. Also make sure
+       to select the right time zone and keyboard layout.
+       <br><br>
+       Press the Next button to continue installation.
+      </td></tr>
+    </table>
+  </p></td>
+    <td colspan="2" valign="top" width="400"><br><p>
+    <table>
+      <tr>
+       <td valign="top" width="30"><img src="plus.png"></td>
+       <td valign="top"><b>Country:</b>
+         The selected country is used to choose nearby mirror
+         servers. This will speedup downloads and make updates more
+         reliable.
+         <br><br>
+       </td>
+      </tr>      
+      <tr>
+       <td valign="top" width="30"><img src="plus.png"></td>
+       <td valign="top"><b>Time Zone:</b>
+         Automatically adjust daylight saving time.
+         <br><br>
+       </td>
+      </tr>      
+      <tr>
+       <td valign="top" width="30"><img src="plus.png"></td>
+       <td valign="top"><b>Keyboard
+         Layout:</b> Choose your keyboard layout.
+         <br><br>
+       </td>
+      </tr>      
+    </table>
+  </p></td>
+</tr>
+</tbody></table>
+</center>
+</body></html>
diff --git a/html-common/ipconf.htm b/html-common/ipconf.htm
new file mode 100644 (file)
index 0000000..3e08db3
--- /dev/null
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="pve-installer.css">
+</head>
+<body>
+<center>
+<table border="0" width="800">
+<tr><td>&nbsp;</td></tr>
+<tr>
+  <td colspan="4" align="center" width="800">
+    <b class="htext">Management Network Configuration</b>
+  </td>
+</tr>
+<tr>
+    <td colspan="2" valign="top" width="400"><br><p>
+    <table>
+      <tbody><tr><td><b>Please verify</b>
+       the displayed network configuration.  You will need a valid network
+       configuration to access the management interface after installation.
+       <br><br>
+       Afterwards press the Next button to continue installation. The
+       installer will then partition your hard disk and start copying packages.
+      </td></tr>
+    </tbody></table>
+  </p></td>
+
+  <td colspan="2" valign="top" width="400"><br><p>
+    <table border="0" width="400">
+      <tbody><tr>
+       <td valign="top" width="30"><img src="plus.png"></td>
+       <td valign="top"><b>IP address:</b>
+         Set the IP address for the Proxmox Virtual Environment.
+         <br><br>
+       </td>
+      </tr>
+      <tr>
+       <td valign="top" width="30"><img src="plus.png"></td>
+       <td valign="top"><b>Netmask:</b>
+         Set the netmask of your network. 
+         <br><br>
+       </td>
+      </tr>
+      <tr>
+       <td valign="top" width="30"><img src="plus.png"></td>
+       <td valign="top"><b>Gateway:</b>
+         IP address of your gateway or firewall.
+         <br><br>
+       </td>
+      </tr>
+      <tr>
+       <td valign="top" width="30"><img src="plus.png"></td>
+       <td valign="top"><b>DNS Server:</b>
+         IP address of your DNS server.
+         <br><br>
+       </td>
+      </tr>
+    </tbody></table>
+    </p>
+  </td>
+</tr>
+</tbody></table>
+</center>
+</body></html>
diff --git a/html-common/license.htm b/html-common/license.htm
new file mode 100644 (file)
index 0000000..7465761
--- /dev/null
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="pve-installer.css">
+</head>
+<body>
+<center>
+<table border="0" width="800">
+<tbody><tr>
+    <td align="center" width="800">
+    <br><br>
+    <b class="htext">__LICENSE_TITLE__</b>
+    <br><br>
+    <textarea class="noresize" readonly="readonly" border="1" name="txt" rows="28" cols="75">__LICENSE__</textarea>
+    </td>
+</tr>
+
+</tbody></table>
+
+</center>
+</body></html>
diff --git a/html-common/nohds.htm b/html-common/nohds.htm
new file mode 100644 (file)
index 0000000..d8a396e
--- /dev/null
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="pve-installer.css">
+</head>
+<body>
+<center>
+<table border=0 width="800">
+<tr>
+  <td width="200">&nbsp;</td>
+  <td width="400" colspan=2><br><br>    
+    <p>
+    <b class="htext">No Hard Disk found!</b>
+    <br><br><br>
+    The installer could not find a supported hard disk. Please visit www.proxmox.com for more information.
+    <br><br><br>
+    <table border=0 width="400">
+      <tr>
+       <td width="40">&nbsp;</td>
+       <td width="30"  valign="top"><img src="plus.png"></td>
+       <td width="560" valign="top">Press CTRL + ALT + F2 to see details<br><br>
+         <br><br>
+       </td> 
+      </tr>
+    </table>    
+    </p>
+  </td>
+  <td width="200">&nbsp;</td>
+</tr>
+</table>
+</center>
+</body>
+</html>
diff --git a/html-common/nonics.htm b/html-common/nonics.htm
new file mode 100644 (file)
index 0000000..cfa9d42
--- /dev/null
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="pve-installer.css">
+</head>
+<body>
+<center>
+<table border=0 width="800">
+<tr>
+  <td width="200">&nbsp;</td>
+  <td width="400" colspan=2><br><br>
+    <p>
+    <b class="htext">No Network Interface found!</b>
+    <br><br><br>
+    The installer could not find a supported network interface card. Please visit www.proxmox.com for more information.
+    <br><br><br>
+    <table border=0 width="400">
+      <tr>
+       <td width="40">&nbsp;</td>
+       <td width="30"  valign="top"><img src="plus.png"></td>
+       <td width="560" valign="top">Press CTRL + ALT + F2 to see details<br><br>
+         <br><br>
+       </td>
+      </tr>
+    </table>
+    </p>
+  </td>
+  <td width="200">&nbsp;</td>
+</tr>
+</table>
+</center>
+</body>
+</html>
diff --git a/html-common/plus.png b/html-common/plus.png
new file mode 100644 (file)
index 0000000..a73a295
Binary files /dev/null and b/html-common/plus.png differ
diff --git a/html-common/pve-installer.css b/html-common/pve-installer.css
new file mode 100644 (file)
index 0000000..78e2fc2
--- /dev/null
@@ -0,0 +1,9 @@
+
+.htext { 
+    font-size: 150%;
+    color: #e57000;
+}
+
+.noresize { 
+  resize: none;
+}
index f46ab8da0dd984769f28ee1b28a65741da71e2be..75e738d32cd2db04eef706791bce3d00a9d0b0cb 100644 (file)
@@ -4,21 +4,14 @@ all:
 
 .phony: install
 install:
-       install -D -m 644 pve-installer.css ${DESTDIR}/var/lib/pve-installer/html/pve-installer.css
        install -D -m 644 page1.htm ${DESTDIR}/var/lib/pve-installer/html/page1.htm
-       install -D -m 644 country.htm ${DESTDIR}/var/lib/pve-installer/html/country.htm
        install -D -m 644 passwd.htm ${DESTDIR}/var/lib/pve-installer/html/passwd.htm
-       install -D -m 644 license.htm ${DESTDIR}/var/lib/pve-installer/html/license.htm
        install -D -m 644 extract1-license.htm ${DESTDIR}/var/lib/pve-installer/html/extract1-license.htm
        install -D -m 644 extract2-rulesystem.htm ${DESTDIR}/var/lib/pve-installer/html/extract2-rulesystem.htm
        install -D -m 644 extract3-spam.htm ${DESTDIR}/var/lib/pve-installer/html/extract3-spam.htm
        install -D -m 644 extract4-virus.htm ${DESTDIR}/var/lib/pve-installer/html/extract4-virus.htm
        install -D -m 644 fail.htm ${DESTDIR}/var/lib/pve-installer/html/fail.htm
-       install -D -m 644 ipconf.htm ${DESTDIR}/var/lib/pve-installer/html/ipconf.htm
-       install -D -m 644 nohds.htm ${DESTDIR}/var/lib/pve-installer/html/nohds.htm
-       install -D -m 644 nonics.htm ${DESTDIR}/var/lib/pve-installer/html/nonics.htm
        install -D -m 644 success.htm ${DESTDIR}/var/lib/pve-installer/html/success.htm
-       install -D -m 644 plus.png ${DESTDIR}/var/lib/pve-installer/html/plus.png
 
 .phony: clean
 clean:
diff --git a/html/country.htm b/html/country.htm
deleted file mode 100644 (file)
index 798e46c..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="pve-installer.css">
-</head>
-<body>
-<center>
-<table border="0" width="800">
-<tr><td>&nbsp;</td></tr>
-<tr>
-  <td colspan="4" align="center" width="800">
-    <b class="htext">Location and Time Zone selection</b>
-  </td>
-</tr>
-<tr>
-    <td colspan="2" valign="top" width="400"><br><p>
-    <table>
-      <tr><td><b>The Proxmox Installer</b>
-       automatically makes location based optimizations, like
-       choosing the nearest mirror to download files. Also make sure
-       to select the right time zone and keyboard layout.
-       <br><br>
-       Press the Next button to continue installation.
-      </td></tr>
-    </table>
-  </p></td>
-    <td colspan="2" valign="top" width="400"><br><p>
-    <table>
-      <tr>
-       <td valign="top" width="30"><img src="plus.png"></td>
-       <td valign="top"><b>Country:</b>
-         The selected country is used to choose nearby mirror
-         servers. This will speedup downloads and make updates more
-         reliable.
-         <br><br>
-       </td>
-      </tr>      
-      <tr>
-       <td valign="top" width="30"><img src="plus.png"></td>
-       <td valign="top"><b>Time Zone:</b>
-         Automatically adjust daylight saving time.
-         <br><br>
-       </td>
-      </tr>      
-      <tr>
-       <td valign="top" width="30"><img src="plus.png"></td>
-       <td valign="top"><b>Keyboard
-         Layout:</b> Choose your keyboard layout.
-         <br><br>
-       </td>
-      </tr>      
-    </table>
-  </p></td>
-</tr>
-</tbody></table>
-</center>
-</body></html>
diff --git a/html/ipconf.htm b/html/ipconf.htm
deleted file mode 100644 (file)
index 3e08db3..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="pve-installer.css">
-</head>
-<body>
-<center>
-<table border="0" width="800">
-<tr><td>&nbsp;</td></tr>
-<tr>
-  <td colspan="4" align="center" width="800">
-    <b class="htext">Management Network Configuration</b>
-  </td>
-</tr>
-<tr>
-    <td colspan="2" valign="top" width="400"><br><p>
-    <table>
-      <tbody><tr><td><b>Please verify</b>
-       the displayed network configuration.  You will need a valid network
-       configuration to access the management interface after installation.
-       <br><br>
-       Afterwards press the Next button to continue installation. The
-       installer will then partition your hard disk and start copying packages.
-      </td></tr>
-    </tbody></table>
-  </p></td>
-
-  <td colspan="2" valign="top" width="400"><br><p>
-    <table border="0" width="400">
-      <tbody><tr>
-       <td valign="top" width="30"><img src="plus.png"></td>
-       <td valign="top"><b>IP address:</b>
-         Set the IP address for the Proxmox Virtual Environment.
-         <br><br>
-       </td>
-      </tr>
-      <tr>
-       <td valign="top" width="30"><img src="plus.png"></td>
-       <td valign="top"><b>Netmask:</b>
-         Set the netmask of your network. 
-         <br><br>
-       </td>
-      </tr>
-      <tr>
-       <td valign="top" width="30"><img src="plus.png"></td>
-       <td valign="top"><b>Gateway:</b>
-         IP address of your gateway or firewall.
-         <br><br>
-       </td>
-      </tr>
-      <tr>
-       <td valign="top" width="30"><img src="plus.png"></td>
-       <td valign="top"><b>DNS Server:</b>
-         IP address of your DNS server.
-         <br><br>
-       </td>
-      </tr>
-    </tbody></table>
-    </p>
-  </td>
-</tr>
-</tbody></table>
-</center>
-</body></html>
diff --git a/html/license.htm b/html/license.htm
deleted file mode 100755 (executable)
index 7465761..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="pve-installer.css">
-</head>
-<body>
-<center>
-<table border="0" width="800">
-<tbody><tr>
-    <td align="center" width="800">
-    <br><br>
-    <b class="htext">__LICENSE_TITLE__</b>
-    <br><br>
-    <textarea class="noresize" readonly="readonly" border="1" name="txt" rows="28" cols="75">__LICENSE__</textarea>
-    </td>
-</tr>
-
-</tbody></table>
-
-</center>
-</body></html>
diff --git a/html/nohds.htm b/html/nohds.htm
deleted file mode 100644 (file)
index d8a396e..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="pve-installer.css">
-</head>
-<body>
-<center>
-<table border=0 width="800">
-<tr>
-  <td width="200">&nbsp;</td>
-  <td width="400" colspan=2><br><br>    
-    <p>
-    <b class="htext">No Hard Disk found!</b>
-    <br><br><br>
-    The installer could not find a supported hard disk. Please visit www.proxmox.com for more information.
-    <br><br><br>
-    <table border=0 width="400">
-      <tr>
-       <td width="40">&nbsp;</td>
-       <td width="30"  valign="top"><img src="plus.png"></td>
-       <td width="560" valign="top">Press CTRL + ALT + F2 to see details<br><br>
-         <br><br>
-       </td> 
-      </tr>
-    </table>    
-    </p>
-  </td>
-  <td width="200">&nbsp;</td>
-</tr>
-</table>
-</center>
-</body>
-</html>
diff --git a/html/nonics.htm b/html/nonics.htm
deleted file mode 100644 (file)
index cfa9d42..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<link rel="stylesheet" type="text/css" href="pve-installer.css">
-</head>
-<body>
-<center>
-<table border=0 width="800">
-<tr>
-  <td width="200">&nbsp;</td>
-  <td width="400" colspan=2><br><br>
-    <p>
-    <b class="htext">No Network Interface found!</b>
-    <br><br><br>
-    The installer could not find a supported network interface card. Please visit www.proxmox.com for more information.
-    <br><br><br>
-    <table border=0 width="400">
-      <tr>
-       <td width="40">&nbsp;</td>
-       <td width="30"  valign="top"><img src="plus.png"></td>
-       <td width="560" valign="top">Press CTRL + ALT + F2 to see details<br><br>
-         <br><br>
-       </td>
-      </tr>
-    </table>
-    </p>
-  </td>
-  <td width="200">&nbsp;</td>
-</tr>
-</table>
-</center>
-</body>
-</html>
diff --git a/html/plus.png b/html/plus.png
deleted file mode 100644 (file)
index a73a295..0000000
Binary files a/html/plus.png and /dev/null differ
diff --git a/html/pve-installer.css b/html/pve-installer.css
deleted file mode 100644 (file)
index 78e2fc2..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-
-.htext { 
-    font-size: 150%;
-    color: #e57000;
-}
-
-.noresize { 
-  resize: none;
-}