From 54854648d73d572b33268a60b3a48529770e2f70 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Mon, 11 Jan 2016 13:47:29 +0100 Subject: [PATCH 1/4] Use Xorg for tinycore appliances This use the tips from @ehlers allowing a better sync between mouse pointer and VNC client. --- appliances/firefox.gns3a | 43 +++++++++++++++-------- appliances/tinycore-linux.gns3a | 22 +++++++++--- packer/tinycore-linux/scripts/gui.sh | 16 ++++++++- packer/tinycore-linux/tinycore-linux.json | 5 +-- 4 files changed, 63 insertions(+), 23 deletions(-) diff --git a/appliances/firefox.gns3a b/appliances/firefox.gns3a index 580dc84..e0a4199 100644 --- a/appliances/firefox.gns3a +++ b/appliances/firefox.gns3a @@ -1,30 +1,37 @@ { + "name": "Firefox", "category": "guest", + "description": "A light Linux based on TinyCore Linux with Firefox preinstalled", + "vendor_name": "Mozilla Foundation", + "vendor_url": "http://www.mozilla.org", + "documentation_url": "https://support.mozilla.org", + "product_name": "Firefox", + "product_url": "https://www.mozilla.org/firefox", + "registry_version": 1, "status": "stable", "maintainer": "GNS3 team", - "name": "Firefox", - "versions": [], - "symbol": "firefox.svg", - "registry_version": 1, "maintainer_email": "developers@gns3.net", - "product_url": "https://www.mozilla.org/firefox", - "documentation_url": "https://support.mozilla.org", - "images": [], - "vendor_name": "Mozilla Foundation", + "symbol": "firefox.svg", "qemu": { "adapter_type": "e1000", - "console_type": "vnc", + "adapters": 1, "ram": 256, "arch": "i386", - "adapters": 1 + "console_type": "vnc", + "options": "-vga std -usbdevice tablet" }, - "product_name": "Firefox", - "vendor_url": "http://www.mozilla.org", - "description": "A light Linux based on TinyCore Linux with Firefox preinstalled", "images": [ + { + "filename": "linux-tinycore-linux-6.4-firefox-33.1.1-2.img", + "version": "31.1.1~2", + "md5sum": "abac0b3f810274f6e3fe81ada8efcfeb", + "filesize": 91881472, + "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/", + "direct_download_url": "http://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/linux-tinycore-linux-6.4-firefox-33.1.1-2.img" + }, { "filename": "linux-tinycore-linux-6.4-firefox-33.1.1.img", - "version": "31.1.1", + "version": "31.1.1~1", "md5sum": "9e51ad24dc25c4a26f7a8fb99bc77830", "filesize": 82313216, "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/", @@ -33,7 +40,13 @@ ], "versions": [ { - "name": "31.1.1", + "name": "31.1.1~2", + "images": { + "hda_disk_image": "linux-tinycore-linux-6.4-firefox-33.1.1-2.img" + } + }, + { + "name": "31.1.1~1", "images": { "hda_disk_image": "linux-tinycore-linux-6.4-firefox-33.1.1.img" } diff --git a/appliances/tinycore-linux.gns3a b/appliances/tinycore-linux.gns3a index 8c734c5..070ed79 100644 --- a/appliances/tinycore-linux.gns3a +++ b/appliances/tinycore-linux.gns3a @@ -13,16 +13,23 @@ "maintainer_email": "developers@gns3.net", "usage": "Login is gns3/gns3. sudo works without password", "symbol": "linux_guest.svg", - "qemu": { "adapter_type": "e1000", "adapters": 1, "ram": 96, "arch": "i386", - "console_type": "vnc" + "console_type": "vnc", + "options": "-vga std -usbdevice tablet" }, - "images": [ + { + "filename": "linux-tinycore-6.4-2.img", + "version": "6.4", + "md5sum": "15c8d14d8b81524fac84f6627ad8867a", + "filesize": 35389440, + "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/", + "direct_download_url": "http://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/linux-tinycore-linux-6.4-2.img" + }, { "filename": "linux-tinycore-6.4.img", "version": "6.4", @@ -32,10 +39,15 @@ "direct_download_url": "http://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/linux-tinycore-linux-6.4.img" } ], - "versions": [ { - "name": "6.4", + "name": "6.4~2", + "images": { + "hda_disk_image": "linux-tinycore-6.4-2.img" + } + }, + { + "name": "6.4~1", "images": { "hda_disk_image": "linux-tinycore-6.4.img" } diff --git a/packer/tinycore-linux/scripts/gui.sh b/packer/tinycore-linux/scripts/gui.sh index 5006119..e760b4b 100644 --- a/packer/tinycore-linux/scripts/gui.sh +++ b/packer/tinycore-linux/scripts/gui.sh @@ -1,7 +1,21 @@ # Install the GUI tce-load -wi fltk-1.3 tce-load -wi flwm -tce-load -wi Xvesa + +# Install gui +tce-load -wi Xorg-7.7 +# set X resolution to 800x600 +cat > 99-resolution.conf <<'EOF' +Section "Screen" + Identifier "Screen0" + DefaultDepth 24 + SubSection "Display" + Modes "800x600" + EndSubSection +EndSection +EOF +sudo mv 99-resolution.conf /usr/local/share/X11/xorg.conf.d/ + tce-load -wi wbar tce-load -wi Xprogs tce-load -wi Xlibs diff --git a/packer/tinycore-linux/tinycore-linux.json b/packer/tinycore-linux/tinycore-linux.json index cd8bcdb..349eab0 100644 --- a/packer/tinycore-linux/tinycore-linux.json +++ b/packer/tinycore-linux/tinycore-linux.json @@ -4,7 +4,7 @@ "tc_iso_checksum": "c8e04e26de234e5528e6eac8ecb1bdda", "vm_name": "linux-tinycore-linux-6.4.img", "setup_script": "core.sh", - "disk_size": 1000 + "disk_size": "1000" }, "builders": [ { @@ -25,7 +25,8 @@ "http_directory": "http", "boot_wait": "5s", "boot_command": [ - "mc user=gns3", + "mc user=gns3", + "sudo udhcpc", "sudo passwd gns3gns3gns3", "tce-load -wi openssh", "cd /usr/local/etc/ssh; [ -f sshd_config.example ] && sudo cp -a sshd_config.example sshd_config; cd", From 4c3dcab4fc8ae19fa1e3582cd914266d19c1150f Mon Sep 17 00:00:00 2001 From: Bernhard Ehlers Date: Thu, 14 Jan 2016 03:20:17 +0100 Subject: [PATCH 2/4] Added keyboard layout setup tool to gui.sh --- .../http/gnome-accessories-character-map.png | Bin 0 -> 2319 bytes .../http/gnome-accessories-character-map.txt | 3 + packer/tinycore-linux/scripts/gui.sh | 192 +++++++++++++++++- packer/tinycore-linux/tinycore-linux.json | 2 +- 4 files changed, 192 insertions(+), 5 deletions(-) create mode 100644 packer/tinycore-linux/http/gnome-accessories-character-map.png create mode 100644 packer/tinycore-linux/http/gnome-accessories-character-map.txt diff --git a/packer/tinycore-linux/http/gnome-accessories-character-map.png b/packer/tinycore-linux/http/gnome-accessories-character-map.png new file mode 100644 index 0000000000000000000000000000000000000000..0469e06e82d041e8d370806bca6b49047698a77b GIT binary patch literal 2319 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 literal 0 HcmV?d00001 diff --git a/packer/tinycore-linux/http/gnome-accessories-character-map.txt b/packer/tinycore-linux/http/gnome-accessories-character-map.txt new file mode 100644 index 0000000..1b3d006 --- /dev/null +++ b/packer/tinycore-linux/http/gnome-accessories-character-map.txt @@ -0,0 +1,3 @@ +Package: gnome-icon-theme-2.31.0.tar.gz +File: gnome/48x48/apps/accessories-character-map +License: The GNOME icon theme is distributed under the terms of either GNU LGPL v.3 or Creative Commons BY-SA 3.0 license. diff --git a/packer/tinycore-linux/scripts/gui.sh b/packer/tinycore-linux/scripts/gui.sh index e760b4b..9c6a33b 100644 --- a/packer/tinycore-linux/scripts/gui.sh +++ b/packer/tinycore-linux/scripts/gui.sh @@ -1,11 +1,180 @@ +set -e +set -x + # Install the GUI tce-load -wi fltk-1.3 tce-load -wi flwm -# Install gui +# Install X tce-load -wi Xorg-7.7 -# set X resolution to 800x600 -cat > 99-resolution.conf <<'EOF' + + +# Create xorg-setup-tools +tce-load -wi Xdialog + +. /etc/init.d/tc-functions +getMirror +wget -P /tmp $MIRROR/squashfs-tools.tcz +tce-load -i /tmp/squashfs-tools.tcz + +sudo mkdir /tmp/xorg-setup-tools +sudo mkdir -p /tmp/xorg-setup-tools/usr/local/bin +sudo mkdir -p /tmp/xorg-setup-tools/usr/local/share/applications +sudo mkdir -p /tmp/xorg-setup-tools/usr/local/share/pixmaps +sudo mkdir -p /tmp/xorg-setup-tools/usr/local/tce.installed + +cat > setup_keyboard <<'EOF' +#!/bin/sh +# setup_keyboard changes the keyboard layout + +# available keyboards +keyboards=' +af "Afghani" +al "Albanian" +et "Amharic" +ara "Arabic" +ma "Arabic (Morocco)" +sy "Arabic (Syria)" +am "Armenian" +az "Azerbaijani" +ml "Bambara" +bd "Bangla" +by "Belarusian" +be "Belgian" +ba "Bosnian" +brai "Braille" +bg "Bulgarian" +mm "Burmese" +cn "Chinese" +hr "Croatian" +cz "Czech" +dk "Danish" +mv "Dhivehi" +nl "Dutch" +bt "Dzongkha" +cm "English (Cameroon)" +gh "English (Ghana)" +ng "English (Nigeria)" +za "English (South Africa)" +gb "English (UK)" +us "English (US)" +epo "Esperanto" +ee "Estonian" +fo "Faroese" +ph "Filipino" +fi "Finnish" +fr "French" +ca "French (Canada)" +cd "French (Democratic Republic of the Congo)" +gn "French (Guinea)" +ge "Georgian" +de "German" +at "German (Austria)" +ch "German (Switzerland)" +gr "Greek" +il "Hebrew" +hu "Hungarian" +is "Icelandic" +in "Indian" +iq "Iraqi" +ie "Irish" +it "Italian" +jp "Japanese" +kz "Kazakh" +kh "Khmer (Cambodia)" +kr "Korean" +kg "Kyrgyz" +la "Lao" +lv "Latvian" +lt "Lithuanian" +mk "Macedonian" +mt "Maltese" +mao "Maori" +md "Moldavian" +mn "Mongolian" +me "Montenegrin" +np "Nepali" +no "Norwegian" +ir "Persian" +pl "Polish" +pt "Portuguese" +br "Portuguese (Brazil)" +ro "Romanian" +ru "Russian" +rs "Serbian" +lk "Sinhala (phonetic)" +sk "Slovak" +si "Slovenian" +es "Spanish" +latam "Spanish (Latin American)" +ke "Swahili (Kenya)" +tz "Swahili (Tanzania)" +se "Swedish" +tw "Taiwanese" +tj "Tajik" +th "Thai" +bw "Tswana" +tr "Turkish" +tm "Turkmen" +ua "Ukrainian" +pk "Urdu (Pakistan)" +uz "Uzbek" +vn "Vietnamese" +sn "Wolof" +' + +# get keyboard layout +eval 'Xdialog --menu "Select Keyboard:" 0 0 0' $keyboards 2> /tmp/setup_keyboard_result +status=$? + +# set new layout +if [ $status -eq 0 ]; then + kbd=`cat /tmp/setup_keyboard_result` + rm -f /tmp/setup_keyboard_result + + sudo sed -i 's/"xkb_layout".*/"xkb_layout" "'"$kbd"'"/' /usr/local/share/X11/xorg.conf.d/98-keyboard.conf + filetool.sh -b + + Xdialog --yesno "Restart GUI to activate?" 0 0 + if [ $? -eq 0 ]; then + sh -c 'killall Xorg; sleep 2; startx /dev/tty1 2>&1' & + fi +else + cat /tmp/setup_keyboard_result >&2 + rm -f /tmp/setup_keyboard_result +fi + +exit $status +EOF +chmod +x setup_keyboard +sudo mv setup_keyboard /tmp/xorg-setup-tools/usr/local/bin/ + +cat > _setup_keyboard.desktop <<'EOF' +[Desktop Entry] +Name=KeyboardLayout +Exec=setup_keyboard +Type=Application +X-FullPathIcon=/usr/local/share/pixmaps/gnome-accessories-character-map.png +Icon=gnome-accessories-character-map.png +Categories=System; +EOF +sudo mv _setup_keyboard.desktop /tmp/xorg-setup-tools/usr/local/share/applications/ + +http=http://`getbootparam http` +wget $http/gnome-accessories-character-map.png +sudo mv gnome-accessories-character-map.png /tmp/xorg-setup-tools/usr/local/share/pixmaps/ + +cat > xorg-setup-tools <<'END_TCE' +mkdir -p /usr/local/share/X11/xorg.conf.d +cat > /usr/local/share/X11/xorg.conf.d/98-keyboard.conf <<'EOF' +Section "InputClass" + Identifier "keyboard" + MatchIsKeyboard "on" + Option "xkb_layout" "us" + Option "xkb_variant" "nodeadkeys" +EndSection +EOF +cat > /usr/local/share/X11/xorg.conf.d/99-resolution.conf <<'EOF' Section "Screen" Identifier "Screen0" DefaultDepth 24 @@ -14,8 +183,23 @@ Section "Screen" EndSubSection EndSection EOF -sudo mv 99-resolution.conf /usr/local/share/X11/xorg.conf.d/ +END_TCE +sudo mv xorg-setup-tools /tmp/xorg-setup-tools/usr/local/tce.installed/ +sudo chown -R root:root /tmp/xorg-setup-tools +sudo chmod +x /tmp/xorg-setup-tools/usr/local/tce.installed/xorg-setup-tools +sudo chgrp -R staff /tmp/xorg-setup-tools/usr/local/tce.installed +sudo chmod 775 /tmp/xorg-setup-tools/usr/local/tce.installed + +mksquashfs /tmp/xorg-setup-tools xorg-setup-tools.tcz +md5sum xorg-setup-tools.tcz > xorg-setup-tools.tcz.md5.txt +echo -e "Xorg-7.7.tcz\nXdialog.tcz" > xorg-setup-tools.tcz.dep +mv xorg-setup-tools* /mnt/sda1/tce/optional/ +echo "xorg-setup-tools.tcz" >> /mnt/sda1/tce/onboot.lst + +echo "usr/local/share/X11/xorg.conf.d" >> /opt/.filetool.lst + +# Remaining packages tce-load -wi wbar tce-load -wi Xprogs tce-load -wi Xlibs diff --git a/packer/tinycore-linux/tinycore-linux.json b/packer/tinycore-linux/tinycore-linux.json index 349eab0..85a6a00 100644 --- a/packer/tinycore-linux/tinycore-linux.json +++ b/packer/tinycore-linux/tinycore-linux.json @@ -25,7 +25,7 @@ "http_directory": "http", "boot_wait": "5s", "boot_command": [ - "mc user=gns3", + "mc user=gns3 http={{ .HTTPIP }}:{{ .HTTPPort }}", "sudo udhcpc", "sudo passwd gns3gns3gns3", "tce-load -wi openssh", From dbb954e43a755d4fcdfe009ccd3876cd9e4785d2 Mon Sep 17 00:00:00 2001 From: Bernhard Ehlers Date: Thu, 14 Jan 2016 14:49:33 +0100 Subject: [PATCH 3/4] Add screen resolution tool to gui.sh --- .../gnome-accessories-character-map.png | Bin .../gnome-accessories-character-map.txt | 0 .../gui/gnome-preferences-desktop-display.png | Bin 0 -> 3339 bytes .../gui/gnome-preferences-desktop-display.txt | 3 + packer/tinycore-linux/scripts/gui.sh | 56 +++++++++++++++++- 5 files changed, 56 insertions(+), 3 deletions(-) rename packer/tinycore-linux/http/{ => gui}/gnome-accessories-character-map.png (100%) rename packer/tinycore-linux/http/{ => gui}/gnome-accessories-character-map.txt (100%) create mode 100644 packer/tinycore-linux/http/gui/gnome-preferences-desktop-display.png create mode 100644 packer/tinycore-linux/http/gui/gnome-preferences-desktop-display.txt diff --git a/packer/tinycore-linux/http/gnome-accessories-character-map.png b/packer/tinycore-linux/http/gui/gnome-accessories-character-map.png similarity index 100% rename from packer/tinycore-linux/http/gnome-accessories-character-map.png rename to packer/tinycore-linux/http/gui/gnome-accessories-character-map.png diff --git a/packer/tinycore-linux/http/gnome-accessories-character-map.txt b/packer/tinycore-linux/http/gui/gnome-accessories-character-map.txt similarity index 100% rename from packer/tinycore-linux/http/gnome-accessories-character-map.txt rename to packer/tinycore-linux/http/gui/gnome-accessories-character-map.txt diff --git a/packer/tinycore-linux/http/gui/gnome-preferences-desktop-display.png b/packer/tinycore-linux/http/gui/gnome-preferences-desktop-display.png new file mode 100644 index 0000000000000000000000000000000000000000..a8427ef5b22192084556203d98ab460ee788e568 GIT binary patch literal 3339 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 V*y9}ckx&2t002ovPDHLkV1l$CVFdsH literal 0 HcmV?d00001 diff --git a/packer/tinycore-linux/http/gui/gnome-preferences-desktop-display.txt b/packer/tinycore-linux/http/gui/gnome-preferences-desktop-display.txt new file mode 100644 index 0000000..ad7d5fe --- /dev/null +++ b/packer/tinycore-linux/http/gui/gnome-preferences-desktop-display.txt @@ -0,0 +1,3 @@ +Package: gnome-icon-theme-2.31.0.tar.gz +File: gnome/48x48/apps/preferences-desktop-display.png +License: The GNOME icon theme is distributed under the terms of either GNU LGPL v.3 or Creative Commons BY-SA 3.0 license. diff --git a/packer/tinycore-linux/scripts/gui.sh b/packer/tinycore-linux/scripts/gui.sh index 9c6a33b..1ab60a1 100644 --- a/packer/tinycore-linux/scripts/gui.sh +++ b/packer/tinycore-linux/scripts/gui.sh @@ -161,9 +161,60 @@ EOF sudo mv _setup_keyboard.desktop /tmp/xorg-setup-tools/usr/local/share/applications/ http=http://`getbootparam http` -wget $http/gnome-accessories-character-map.png +wget $http/gui/gnome-accessories-character-map.png sudo mv gnome-accessories-character-map.png /tmp/xorg-setup-tools/usr/local/share/pixmaps/ +cat > setup_resolution <<'EOF' +#!/bin/sh +# setup_resolution changes the screen resolution + +# available resolutions +resolutions=' +1024x768 "" +800x600 "" +640x480 "" +' + +# get resolution +eval 'Xdialog --menu "Select resolution:" 10 40 0' $resolutions 2> /tmp/setup_resolution_result +status=$? + +# set new layout +if [ $status -eq 0 ]; then + res=`cat /tmp/setup_resolution_result` + rm -f /tmp/setup_resolution_result + + sudo sed -i 's/Modes.*/Modes "'"$res"'"/' /usr/local/share/X11/xorg.conf.d/99-resolution.conf + filetool.sh -b + + Xdialog --yesno "Restart GUI to activate?" 0 0 + if [ $? -eq 0 ]; then + sh -c 'killall Xorg; sleep 2; startx /dev/tty1 2>&1' & + fi +else + cat /tmp/setup_resolution_result >&2 + rm -f /tmp/setup_resolution_result +fi + +exit $status +EOF +chmod +x setup_resolution +sudo mv setup_resolution /tmp/xorg-setup-tools/usr/local/bin/ + +cat > _setup_resolution.desktop <<'EOF' +[Desktop Entry] +Name=ScreenResolution +Exec=setup_resolution +Type=Application +X-FullPathIcon=/usr/local/share/pixmaps/gnome-preferences-desktop-display.png +Icon=gnome-preferences-desktop-display.png +Categories=System; +EOF +sudo mv _setup_resolution.desktop /tmp/xorg-setup-tools/usr/local/share/applications/ + +wget $http/gui/gnome-preferences-desktop-display.png +sudo mv gnome-preferences-desktop-display.png /tmp/xorg-setup-tools/usr/local/share/pixmaps/ + cat > xorg-setup-tools <<'END_TCE' mkdir -p /usr/local/share/X11/xorg.conf.d cat > /usr/local/share/X11/xorg.conf.d/98-keyboard.conf <<'EOF' @@ -177,7 +228,6 @@ EOF cat > /usr/local/share/X11/xorg.conf.d/99-resolution.conf <<'EOF' Section "Screen" Identifier "Screen0" - DefaultDepth 24 SubSection "Display" Modes "800x600" EndSubSection @@ -187,7 +237,7 @@ END_TCE sudo mv xorg-setup-tools /tmp/xorg-setup-tools/usr/local/tce.installed/ sudo chown -R root:root /tmp/xorg-setup-tools -sudo chmod +x /tmp/xorg-setup-tools/usr/local/tce.installed/xorg-setup-tools +sudo chmod +x /tmp/xorg-setup-tools/usr/local/tce.installed/* sudo chgrp -R staff /tmp/xorg-setup-tools/usr/local/tce.installed sudo chmod 775 /tmp/xorg-setup-tools/usr/local/tce.installed From 945f6bbfe6710d0ee88d76ce7cb5544fb1baa59d Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Mon, 18 Jan 2016 12:06:22 +0100 Subject: [PATCH 4/4] Release new appliances versions --- appliances/firefox.gns3a | 4 ++-- appliances/tinycore-linux.gns3a | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appliances/firefox.gns3a b/appliances/firefox.gns3a index e0a4199..35217fe 100644 --- a/appliances/firefox.gns3a +++ b/appliances/firefox.gns3a @@ -24,8 +24,8 @@ { "filename": "linux-tinycore-linux-6.4-firefox-33.1.1-2.img", "version": "31.1.1~2", - "md5sum": "abac0b3f810274f6e3fe81ada8efcfeb", - "filesize": 91881472, + "md5sum": "8db0d8dc890797cc335ceb8aaf2255f0", + "filesize": 93257728, "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/", "direct_download_url": "http://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/linux-tinycore-linux-6.4-firefox-33.1.1-2.img" }, diff --git a/appliances/tinycore-linux.gns3a b/appliances/tinycore-linux.gns3a index 070ed79..845a8e0 100644 --- a/appliances/tinycore-linux.gns3a +++ b/appliances/tinycore-linux.gns3a @@ -25,8 +25,8 @@ { "filename": "linux-tinycore-6.4-2.img", "version": "6.4", - "md5sum": "15c8d14d8b81524fac84f6627ad8867a", - "filesize": 35389440, + "md5sum": "dcbb5318c3e18ab085088d4474d8de85", + "filesize": 36503552, "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/", "direct_download_url": "http://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/linux-tinycore-linux-6.4-2.img" },