aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-05-30 15:48:47 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2014-05-30 15:48:47 +0200
commitc1a51c0340bf3aceb9fde3eefe9bc189a63f0794 (patch)
treedb640300179a0dda835d77d58f13621b8a99420f
parent0b5bf00f3cee569883b2dbee1649e24de4d88d7e (diff)
downloadalpine-conf-3.0.2.tar.bz2
alpine-conf-3.0.2.tar.xz
==== release 3.0.2 ====v3.0.2
-rw-r--r--Makefile2
-rw-r--r--setup-xfce-desktop6
-rw-r--r--setup-xfce-desktop.in6
-rw-r--r--tmproot/etc/hostname1
-rw-r--r--tmproot/etc/network/interfaces7
-rw-r--r--tmproot/etc/profile.d/proxy.sh5
6 files changed, 26 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index fac2d26..f3dcb40 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION := 3.0.1
+VERSION := 3.0.2
sysconfdir ?= /etc/lbu
diff --git a/setup-xfce-desktop b/setup-xfce-desktop
new file mode 100644
index 0000000..2a2ce2d
--- /dev/null
+++ b/setup-xfce-desktop
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+videodrivers=$(apk search --quiet --exact xf86-video* | grep -v -- '-doc$')
+
+setup-xorg-base $videodrivers xfce4 firefox slim
+
diff --git a/setup-xfce-desktop.in b/setup-xfce-desktop.in
new file mode 100644
index 0000000..2a2ce2d
--- /dev/null
+++ b/setup-xfce-desktop.in
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+videodrivers=$(apk search --quiet --exact xf86-video* | grep -v -- '-doc$')
+
+setup-xorg-base $videodrivers xfce4 firefox slim
+
diff --git a/tmproot/etc/hostname b/tmproot/etc/hostname
new file mode 100644
index 0000000..d63e5d0
--- /dev/null
+++ b/tmproot/etc/hostname
@@ -0,0 +1 @@
+ncopa-desktop
diff --git a/tmproot/etc/network/interfaces b/tmproot/etc/network/interfaces
new file mode 100644
index 0000000..ed1cb34
--- /dev/null
+++ b/tmproot/etc/network/interfaces
@@ -0,0 +1,7 @@
+auto lo
+iface lo inet loopback
+
+auto br64
+iface br64 inet dhcp
+ hostname ncopa-desktop
+
diff --git a/tmproot/etc/profile.d/proxy.sh b/tmproot/etc/profile.d/proxy.sh
new file mode 100644
index 0000000..5b349bb
--- /dev/null
+++ b/tmproot/etc/profile.d/proxy.sh
@@ -0,0 +1,5 @@
+# this file was generated with and might get overwritten by setup-proxy
+
+export http_proxy=http://proxy.nor.wtbts.net:8080
+export https_proxy=http://proxy.nor.wtbts.net:8080
+export ftp_proxy=http://proxy.nor.wtbts.net:8080