summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2013-12-25 14:18:46 +0100
committermh <mh@immerda.ch>2013-12-25 14:18:46 +0100
commit620b4caa4a1b2bf791eaffb271d8323ef1e383b4 (patch)
treeb13193e555b47e82912409bd74e613c7147979c7
parent34fc434fb36327167f8329f24283296ddf9f4a5c (diff)
release a working F19 version
-rw-r--r--.gitignore1
-rw-r--r--README.md14
-rw-r--r--Veeweefile15
-rw-r--r--definitions/mh-desktop/definition.rb (renamed from definition.rb)9
-rw-r--r--definitions/mh-desktop/ks.cfg (renamed from ks.cfg)22
-rw-r--r--definitions/mh-desktop/postinstall.sh (renamed from postinstall.sh)11
6 files changed, 54 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7bf9b0a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+iso/*
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..a93c2fe
--- /dev/null
+++ b/README.md
@@ -0,0 +1,14 @@
+An awesome gnome desktop
+========================
+
+This is how I build up my awesome gnome desktop env.
+
+Use
+---
+
+ git clone https://git-scritch.immerda.ch/vagrant/mh-desktop
+ cd mh-desktop
+ # be sure to not use ssh-agent
+ unset SSH_AUTH_SOCK
+ veewee kvm build 'mh-desktop'
+
diff --git a/Veeweefile b/Veeweefile
new file mode 100644
index 0000000..07e5ba2
--- /dev/null
+++ b/Veeweefile
@@ -0,0 +1,15 @@
+Veewee::Config.run do |config|
+
+ # Initialize convenience vars
+ cwd = File.dirname(__FILE__)
+ env = config.veewee.env
+
+ # These env settings will override default settings
+ #env.cwd = cwd
+ #env.definition_dir = File.join(cwd, 'definitions')
+ #env.template_path = [File.join(cwd, 'templates')]
+ #env.iso_dir = File.join(cwd, 'iso')
+ #env.validation_dir = File.join(cwd, 'validation')
+ #env.tmp_dir = "/tmp"
+
+end
diff --git a/definition.rb b/definitions/mh-desktop/definition.rb
index 1f5b8c8..6a35352 100644
--- a/definition.rb
+++ b/definitions/mh-desktop/definition.rb
@@ -3,13 +3,14 @@ Veewee::Session.declare({
:cpu_count => '1', :memory_size=> '1024',
:disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :hwvirtext => 'on',
:os_type_id => 'Fedora_64',
- :iso_file => "Fedora-19-x86_64-DVD.iso",
- :iso_src => "http://mirror.switch.ch/ftp/mirror//fedora/linux/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-DVD.iso",
- :iso_sha256 => "6e7e263e607cfcadc90ea2ef5668aa3945d9eca596485a7a1f8a9f2478cc7084",
+ :iso_file => "Fedora-19-x86_64-netinst.iso",
+ :iso_src => "http://ftp.tu-chemnitz.de/pub/linux/fedora/linux/releases/19/Fedora/x86_64/iso/Fedora-19-x86_64-netinst.iso",
+ #:iso_sha256 => "376be7d4855ad6281cb139430606a782fd6189dcb01d7b61448e915802cc350f",
+ :iso_sha256 => "ef9eb28b6343e57de292f2b2147b8e74a2a04050655e0dc959febd69b0d5d030",
:iso_download_timeout => 1000,
:boot_wait => "10", :boot_cmd_sequence => [ '<Tab> linux text biosdevname=0 ks=http://%IP%:%PORT%/ks.cfg<Enter><Enter>' ],
:kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "ks.cfg",
- :ssh_login_timeout => "10000", :ssh_user => "mh", :ssh_password => "vagrant", :ssh_key => "",
+ :ssh_login_timeout => "1000", :ssh_user => "mh", :ssh_password => "vagrant", :ssh_key => "",
:ssh_host_port => "7222", :ssh_guest_port => "22",
:sudo_cmd => "echo '%p'|sudo -S sh '%f'",
:shutdown_cmd => "/sbin/halt -h -p",
diff --git a/ks.cfg b/definitions/mh-desktop/ks.cfg
index 41b9389..51ea590 100644
--- a/ks.cfg
+++ b/definitions/mh-desktop/ks.cfg
@@ -1,18 +1,21 @@
# Kickstart file automatically generated by anaconda.
install
-cdrom
+url --url=http://mirror.switch.ch/ftp/mirror/fedora/linux/releases/19/Fedora/x86_64/os/
lang en_US.UTF-8
keyboard 'sg-latin1'
# note we set biosdevname=0 when launching install
# this means we will be using standard ethernet devices, e.g. eth[0,1,2] eth
network --onboot yes --device eth0 --bootproto dhcp
timezone --utc Europe/Zurich
-rootpw --iscrypted $6$n/NGsk5H2aiBMXL4$r/oPkJtB5rasvQHPo9AvIJBe6sNVlQbpZxvTRMN7.qZk/Sn9u2qZ0XgNxflUvK20y7OIWdr/vv7MED6gzkBiH0
+rootpw --iscrypted $6$n/NGsk5H2aiBMXL4$r/oPkJtB5rasvQHPo9AvIJBe6sNVlQbpZxvTRMN7.qZk/Sn9u2qZ0XgNxflUvK19y7OIWdr/vv7MED6gzkBiH0
selinux --enforcing
auth --enableshadow --passalgo=sha512
firewall --service=ssh
+repo --name="Fedora 19 - x86_64 - Os" --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-19&arch=x86_64
+repo --name="Fedora 19 - x86_64 - Updates" --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f19&arch=x86_64
+
# Avoiding warning message on Storage device breaking automated generation
zerombr
@@ -29,10 +32,7 @@ part pv.2 --grow --size=500
volgroup vg_system --pesize=32768 pv.2
logvol / --fstype=ext4 --name=lv_root --vgname=vg_system --size=1024 --grow
logvol swap --fstype=swap --name=lv_swap --vgname=vg_system --size=528 --grow --maxsize=1056
-bootloader --location=mbr --driveorder=vda --append="norhgb biosdevname=0"
-# Disable remote repositories, as this is a non-netinst install.
-#repo --name="Fedora 17 - x86_64" --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-17&arch=x86_64 --cost=1000
-#repo --name="Fedora 19 - x86_64 - Updates" --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f19&arch=x86_64 --cost=1000
+bootloader --location=mbr --driveorder=vda
services --enabled network
firstboot --disable
reboot
@@ -48,12 +48,8 @@ notification-daemon
Terminal
awesome
xfce4-power-manager
-xfce4-volumed
zenity
pidgin
-pidgin-otr
-thunderbird-enigmail
-thunderbird-lightning
thunderbird
firefox
%end
@@ -72,4 +68,10 @@ ln -s /dev/null /etc/udev/rule.d/70-persistent-net.rules
/usr/sbin/groupadd mh
/usr/sbin/useradd mh -g mh -G wheel,polkitd,dialout
echo "vagrant"|passwd --stdin mh
+
+echo "mh ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/mh
+chmod 0440 /etc/sudoers.d/mh
+
+mkdir /home/mh/.config
+echo "yes" >> /home/mh/.config/gnome-initial-setup-done
%end
diff --git a/postinstall.sh b/definitions/mh-desktop/postinstall.sh
index 6150497..38c5073 100644
--- a/postinstall.sh
+++ b/definitions/mh-desktop/postinstall.sh
@@ -3,6 +3,7 @@
date > /etc/mh_box_build_time
yum -y update
+yum -y install xfce4-volumed pidgin-otr thunderbird-enigmail thunderbird-lightning
# setup awesome gnome
cat > /usr/share/applications/awesome.desktop<<END
@@ -36,7 +37,7 @@ END
mkdir /home/mh/.config/awesome /home/mh/bin /home/mh/.config/Terminal -p
-cat > /home/mh/bin/shutdown_dialog.sh<<END
+echo '
#!/bin/sh
ACTION=`zenity --width=90 --height=260 --list --radiolist --text="Select logout action" --title="Logout" --column "Choice" --column "Action" FALSE Shutdown FALSE Reboot FALSE LockScreen FALSE Logout TRUE Suspend`
@@ -64,10 +65,10 @@ if [ -n "\${ACTION}" ];then
;;
esac
fi
-END
+' > /home/mh/bin/shutdown_dialog.sh
chmod +x /home/mh/bin/shutdown_dialog.sh
-cat > /home/mh/mh/.config/Terminal/terminalrc<<END
+cat > /home/mh/.config/Terminal/terminalrc<<END
[Configuration]
MiscAlwaysShowTabs=FALSE
MiscBell=FALSE
@@ -551,11 +552,13 @@ awful.util.spawn_with_shell('/usr/bin/xfce4-volumed')
END
mkdir /home/mh/.ssh
-chown 0700 /home/mh/.ssh
+chmod 0700 /home/mh/.ssh
cat > /home/mh/.ssh/authorized_keys<<END
ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEA2UqGa89FntQi1Wa697FuqYWH/oPKPzFexaanIe33VDIBri1mZNwYAn3/i3URLBsSjxdkJkFTXk51hC5ot3Oc7s4DfeUBShTOjJMi4s6qJtXjTyv6iUI0lY7OrY3B4oMEuROFfJpCK4Noa3s1DlbD+X1HVTxjH8c1KGcq8bOdbBQxiEpLlUsRN1VOXYxhWe6I5E5vVQTZQzAv9vJvOzY/B8pfEL1sw/SZmsfxZsFFZZuidIGui7D/wDL46ujX/pau71I2JWLfN/YqD01vaMYnz3HOMYbVFMDdJRjxIKsD3vr7IqnD97k1NDFxjZtcNabpy9zNCFkwxp+rzjTcSv9wwZ+v97ln+FcMVDen5u/4VWMUQ9Xt0B/IWJgGuU3+RjHM4McTKpCodVioF0vbesE+EUpa36abTL5X5dNw9pk+dbF7XUltw/4KgNSAnWjOi1dCCer7mOrxCUtaCveTiN+hrqG+e4K5LV6/IqiBLyIVHoGpqCDpx0mKrTGur336UMbP0HREASehvSuzdYASDz1GoESYUbuysSa6nfRL675pdTcnNrfO5+nxbe09QtgTy3bT4aMfNamuTJtdeRU1+RRRM4ZUwBU+XKv+lokrV3gLfWrKVExvXfYpPMsg/BYmeaS3go3v+J/PM+XNjnTm5KtkTNvEZimUM7YPFTuojnZt140= mh
END
+chown mh:mh /home/mh -R
+
shutdown -r +2
exit