add pve-usbstick.adoc, fix mediawiki importer

diff --git a/Makefile b/Makefile
index ccd647374f798ca2166727b6f4326ed808b71911..2d122d53cc4e46c2cc3e3eab6c5fc3651fc3236f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -101,6 +101,7 @@ GEN_SCRIPTS=                                        \
        gen-pve-firewall-vm-opts.pl
 
 INSTALLATION_SOURCES=                          \
+       pve-usbstick.adoc                       \
        pve-installation.adoc
 
 SYSADMIN_PARTS=                                        \
@@ -156,6 +157,7 @@ PVE_ADMIN_GUIDE_SOURCES=                    \
        attributes.txt
 
 WIKI_IMPORTS=                                                                  \
+       section-pve-usbstick-plain.html                                         \
        $(addsuffix -plain.html, $(addprefix sysadmin-, ${SYSADMIN_PARTS}))     \
        $(addsuffix -plain.html, $(addprefix chapter-, ${CHAPTER_LIST}))        \
        $(addsuffix .5-plain.html, ${CONFIG_LIST})                              \
@@ -185,6 +187,9 @@ all: index.html
 sysadmin-%-plain.html: %.adoc
        asciidoc -s -a wiki -a 'leveloffset=-1' ${ADOC_STDARG} -o $@ $*.adoc
 
+section-%-plain.html: %.adoc
+       asciidoc -s -a wiki -a 'leveloffset=-1' ${ADOC_STDARG} -o $@ $*.adoc
+
 chapter-sysadmin.html chapter-sysadmin-plain.html: ${SYSADMIN_SOURCES}
 
 chapter-%.html: %.adoc ${PVE_COMMON_DOC_SOURCES}

diff --git a/debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import b/debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import
index 905571006502bf1ffe6ee06c56e1927162442523..e65aab0b42ea5d287b7bd57d6fba8c74dc027b1f 100755 (executable)
--- a/debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import
+++ b/debian/tree/pve-docs-mediawiki/pve-docs-mediawiki-import
@@ -68,6 +68,14 @@ my $docs = {
        title => "High Availability",
        category => $cat_refdoc,
     },
+    'chapter-pve-installation-plain.html' => {
+       title => "Installation",
+       category => $cat_refdoc,
+    },
+    'section-pve-usbstick-plain.html' => {
+       title => "Install from USB Stick",
+       category => $cat_refdoc,
+    },
     'sysadmin-getting-help-plain.html' => {
        title => "Getting Help",
        category => $cat_refdoc,
@@ -84,10 +92,6 @@ my $docs = {
        title => "Logical Volume Manager (LVM)",
        category => $cat_refdoc,
     },
-    'sysadmin-pve-installation-plain.html' => {
-       title => "Installation",
-       category => $cat_refdoc,
-    },
     'sysadmin-pve-package-repos-plain.html' => {
        title => "Package Repositories",
        category => $cat_refdoc,

diff --git a/pve-installation.adoc b/pve-installation.adoc
index 75dd9874eb27d0cc52018e6ade83205ab6f9be17..8321992550b7d5e161cd1b13107241e9406a6f66 100644 (file)
--- a/pve-installation.adoc
+++ b/pve-installation.adoc
@@ -151,6 +151,9 @@ ifdef::wiki[]
 link:/wiki/Install_Proxmox_VE_on_Debian_Jessie[Install Proxmox VE on Debian Jessie]
 -----------------------------------------------------------------------------------
 
+link:/wiki/Install_from_USB_Stick[Install from USB Stick]
+---------------------------------------------------------
+
 endif::wiki[]
 
 ifndef::wiki[]
@@ -171,8 +174,9 @@ apt-get install proxmox-ve
 You can find a detailed step by step howto on the
 {webwiki-url}Install_Proxmox_VE_on_Debian_Jessie[wiki].
 
-endif::wiki[]
+include::pve-usbstick.adoc[]
 
+endif::wiki[]
 
 ifdef::wiki[]
 

diff --git a/pve-usbstick.adoc b/pve-usbstick.adoc
new file mode 100644 (file)
index 0000000..cd263db
--- /dev/null
+++ b/pve-usbstick.adoc
@@ -0,0 +1,121 @@
+Install from USB Stick
+----------------------
+include::attributes.txt[]
+
+The {pve} installation media is now a hybrid ISO image, working in two
+ways:
+
+* An ISO image file ready to burn on CD
+
+* A raw sector (IMG) image file ready to directly copy to flash media
+  (USB Stick)
+
+Using USB sticks is faster and more environmental friendly and
+therefore the recommended way to install {pve}.
+
+
+Prepare a USB flash drive as install medium
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to boot the installation media, copy the ISO image to a USB
+media.
+
+First download the ISO image from
+https://www.proxmox.com/en/downloads/category/iso-images-pve
+
+You need at least a 1 GB USB media.
+
+NOTE: Using UNetbootin or Rufus does not work.
+
+IMPORTANT: Make sure that the USB media is not mounted and does not
+contain any important data.
+
+
+Instructions for GNU/Linux
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can simply use `dd` on UNUX like systems. First download the ISO
+image, then plug in the USB stick. You need to find out what device
+name gets assigned to the USB stick (see below). Then run:
+
+----
+dd if=proxmox-ve_*.iso of=/dev/XYZ bs=1M
+----
+
+NOTE: Be sure to replace /dev/XYZ with the correct device name.
+
+CAUTION: Be very careful, and do not overwrite the hard disk!
+
+
+Find Correct USB Device Name
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You can compare the last lines of 'dmesg' command before and after the
+insertion, or use the 'lsblk' command. Open a terminal and run:
+
+----
+ lsblk
+----
+
+Then plug in your USB media and run the command again:
+
+----
+ lsblk
+----
+
+A new device will appear, and this is the USB device you want to use.
+
+
+Instructions for OSX
+~~~~~~~~~~~~~~~~~~~~
+
+Open the terminal (query Terminal in Spotlight).
+
+Convert the .iso file to .img using the convert option of hdiutil for example.
+
+----
+hdiutil convert -format UDRW -o proxmox-ve_*.dmg proxmox-ve_*.iso
+----
+
+TIP: OS X tends to put the .dmg ending on the output file automatically.
+
+To get the current list of devices run the command again:
+
+----
+diskutil list
+----
+
+Now insert your USB flash media and run this command again to
+determine the device node assigned to your flash media
+(e.g. /dev/diskX).
+
+----
+diskutil list
+
+diskutil unmountDisk /dev/diskX
+----
+
+NOTE: replace X with the disk number from the last command.
+
+----
+sudo dd if=proxmox-ve_*.dmg of=/dev/rdiskN bs=1m
+----
+
+
+Instructions for Windows
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to copy the ISO, rename it first. Just rename the downloaded
+file from proxmox-ve_*.iso to proxmox-ve_*.raw.
+
+Download the SUSE Studio ImageWriter from https://en.opensuse.org/SDB:Live_USB_stick
+
+If this doesn't work, alternative use the OSForsenics USB
+installer from http://www.osforensics.com/portability.html
+
+
+Boot your server from USB media
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Connect your USB media to your server and make sure that the server
+boots from USB (see server BIOS). Then follow the installation wizard.
\ No newline at end of file