summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--helper/system.inc8
-rw-r--r--remote/modules/kdm/kdm.conf.zypper2
-rw-r--r--remote/modules/pam/pam.conf.zypper6
-rw-r--r--remote/modules/policykit/policykit.build2
-rw-r--r--remote/modules/policykit/policykit.conf.zypper3
-rw-r--r--remote/modules/rsyslogd/rsyslogd.conf2
-rw-r--r--remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules2
-rw-r--r--remote/modules/systemd/systemd.build4
-rw-r--r--remote/modules/systemd/systemd.conf7
-rw-r--r--remote/modules/systemd/systemd.conf.zypper7
-rwxr-xr-xremote/modules/vmplayer/data/etc/openslx/vmware/vmware-env22
-rw-r--r--remote/modules/vmplayer/vmplayer.build2
-rwxr-xr-xremote/rootfs/rootfs-stage31/data/bin/setup_network25
-rw-r--r--remote/rootfs/rootfs-stage32/rootfs-stage32.build2
-rw-r--r--remote/rootfs/rootfs-stage32/rootfs-stage32.conf12
-rw-r--r--remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper31
16 files changed, 57 insertions, 80 deletions
diff --git a/helper/system.inc b/helper/system.inc
index 0cfcfbc6..c37368cb 100644
--- a/helper/system.inc
+++ b/helper/system.inc
@@ -18,3 +18,11 @@ KERNEL_VERSION=$(uname -r)
# determine number of CPU cores
CPU_CORES=$(cat /proc/cpuinfo | grep processor | wc -l)
export MAKEFLAGS="-j$CPU_CORES"
+
+# Determine if we have lib64
+if [ "$(uname -m)x" = "x86_64x" ]; then
+ LIB64="lib64"
+else
+ LIB64="lib"
+fi
+
diff --git a/remote/modules/kdm/kdm.conf.zypper b/remote/modules/kdm/kdm.conf.zypper
index a2266c52..081865b3 100644
--- a/remote/modules/kdm/kdm.conf.zypper
+++ b/remote/modules/kdm/kdm.conf.zypper
@@ -2,7 +2,7 @@ REQUIRED_INSTALLED_PACKAGES="kdm"
REQUIRED_CONTENT_PACKAGES="kdm kde4-kgreeter-plugins"
REQUIRED_BINARIES=""
REQUIRED_DIRECTORIES=" /etc/dbus-1
- /usr/lib/kde4
+ /usr/$LIB64/kde4
/usr/share/dbus-1
/usr/share/polkit-1
/usr/share/kde4/services
diff --git a/remote/modules/pam/pam.conf.zypper b/remote/modules/pam/pam.conf.zypper
index 58f8bb46..2defe1bb 100644
--- a/remote/modules/pam/pam.conf.zypper
+++ b/remote/modules/pam/pam.conf.zypper
@@ -1,10 +1,10 @@
REQUIRED_INSTALLED_PACKAGES=" pam_ldap pam pam-devel nss_ldap pam-modules"
REQUIRED_CONTENT_PACKAGES=" pam_ldap pam pam-devel nss_ldap pam-modules nss-mdns"
REQUIRED_BINARIES=" mkhomedir_helper"
-REQUIRED_DIRECTORIES=" /lib
- /usr/lib
+REQUIRED_DIRECTORIES=" /$LIB64
+ /usr/$LIB64
/etc/security"
REQUIRED_SYSTEM_FILES=" /etc/login.defs
/etc/securetty
- /lib/security"
+ /$LIB64/security"
diff --git a/remote/modules/policykit/policykit.build b/remote/modules/policykit/policykit.build
index 7c2f3991..591c180f 100644
--- a/remote/modules/policykit/policykit.build
+++ b/remote/modules/policykit/policykit.build
@@ -15,7 +15,7 @@ build () {
post_copy() {
local POLPATH="$(grep '/polkitd$' "$COPYLIST" | head -1 | sed -e 's/[\/&]/\\&/g')"
- sed -i "s/%%POLKITD%%/${POLPATH}/g" "$TARGET_BUILD_DIR/etc/systemd/system/polkitd.service"
+ [ -n "$POLPATH" ] && sed -i "s/%%POLKITD%%/${POLPATH}/g" "$TARGET_BUILD_DIR/etc/systemd/system/polkitd.service"
#Add Polkit User/Group/Shadow to Stage3.2
pinfo "Adding polkitd user to target system..."
add_user "polkitd"
diff --git a/remote/modules/policykit/policykit.conf.zypper b/remote/modules/policykit/policykit.conf.zypper
index 87c0014e..c93181c5 100644
--- a/remote/modules/policykit/policykit.conf.zypper
+++ b/remote/modules/policykit/policykit.conf.zypper
@@ -5,7 +5,6 @@ REQUIRED_DIRECTORIES=" /etc/pam.d /etc/dbus-1 /etc/polkit-1
/usr/bin
/usr/share/dbus-1
/usr/share/polkit-1
- /usr/lib/polkit-1
- /usr${ARCH_LIB_DIR}/polkit-1"
+ /usr/lib/polkit-1"
REQUIRED_FILES=""
REQUIRED_LIBRARIES="libmozjs185"
diff --git a/remote/modules/rsyslogd/rsyslogd.conf b/remote/modules/rsyslogd/rsyslogd.conf
index d0d46e77..f5d60989 100644
--- a/remote/modules/rsyslogd/rsyslogd.conf
+++ b/remote/modules/rsyslogd/rsyslogd.conf
@@ -1,4 +1,4 @@
REQUIRED_CONTENT_PACKAGES=" rsyslog"
REQUIRED_BINARIES=" rsyslogd"
REQUIRED_FILES=" /etc/rsyslog.conf"
-REQUIRED_DIRECTORIES=" /usr/lib/rsyslog"
+REQUIRED_DIRECTORIES=" /usr/$LIB64/rsyslog"
diff --git a/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules b/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
index d18123fd..3a64e06e 100644
--- a/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
+++ b/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
@@ -31,7 +31,7 @@ SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_T
#
# http://git.kernel.org/?p=linux/hotplug/udev.git;a=blob;f=libudev/libudev-enumerate.c;h=da831449dcaf5e936a14409e8e68ab12d30a98e2;hb=HEAD#l742
-SUBSYSTEM=="net", KERNEL!="lo|vmnet*", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/$name", ENV{SYSTEMD_WANTS}="network-interface@$name.service"
+SUBSYSTEM=="net", KERNEL!="lo|vmnet*|eth*", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/$name", ENV{SYSTEMD_WANTS}="network-interface@$name.service"
SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/bluetooth/devices/%k"
SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_WANTS}="bluetooth.target"
diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index d3a58363..a84cc7b3 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -18,7 +18,7 @@ build () {
pinfo "Building systemd"
cd "${MODULE_DIR}/src/$REQUIRED_VERSION"
pinfo "calling configure"
- ./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated --disable-localed --disable-coredump --disable-keymap --without-python || perror "configure failed."
+ ./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated --disable-localed --disable-coredump --disable-keymap --without-python --enable-blkid || perror "configure failed."
pinfo "calling make"
make || perror "make failed."
pinfo "calling make install"
@@ -34,7 +34,7 @@ build () {
post_copy() {
# dont clear systemd log at startup
- sed -i.bak "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service"
+ sed -i "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service"
#old agetty version doesn't support --noclear option in getty service
if [ "x$(dpkg -s util-linux | grep Version: | cut -d' ' -f2)" == "x2.19.1-2ubuntu3" ];
diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/systemd.conf
index 7f469be6..19e4084e 100644
--- a/remote/modules/systemd/systemd.conf
+++ b/remote/modules/systemd/systemd.conf
@@ -24,14 +24,17 @@ REQUIRED_DISABLED_SERVICES="
systemd-initctl.socket
swap.target
"
-REQUIRED_INSTALLED_PACKAGES=" intltool
+REQUIRED_INSTALLED_PACKAGES="
+ intltool
gperf
dbus
pkg-config
libcap-dev
libudev-dev
libdbus-1-dev
- xsltproc"
+ xsltproc
+ libblkid-dev
+"
REQUIRED_BINARIES=" hostnamectl
journalctl
localectl
diff --git a/remote/modules/systemd/systemd.conf.zypper b/remote/modules/systemd/systemd.conf.zypper
index 60038937..f727789c 100644
--- a/remote/modules/systemd/systemd.conf.zypper
+++ b/remote/modules/systemd/systemd.conf.zypper
@@ -1,7 +1,10 @@
-REQUIRED_INSTALLED_PACKAGES=" intltool
+REQUIRED_INSTALLED_PACKAGES="
+ intltool
gperf
pkg-config
libcap-devel
libudev-devel
dbus-1-devel
- libxslt-tools"
+ libxslt-tools
+ libblkid-devel
+"
diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env b/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env
index 6200c981..f1f52040 100755
--- a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env
+++ b/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env
@@ -18,24 +18,6 @@ VMWARE_CONF_DIR=/etc/openslx/vmware
. /opt/openslx/config
. ${VMWARE_CONF_DIR}/vmware.conf
-setup_bridge() {
- # Init hook to create a bridge on the active network interface
- # (should be kept identical to the files of virtualbox and qemukvm plugins)
- #############################################################################
-
- local bridge=br0
- local brnwif=eth0
- local nwifmac=${SLX_PXE_MAC}
-
- # bridge 0 already defined or some other problem
- brctl addbr ${bridge}
- brctl stp ${bridge} 0
- brctl setfd ${bridge} 0.000000000001
- ip link set addr ${nwifmac} ${bridge}
- ip link set dev ${nwif} up
- brctl addif ${bridge} ${nwif}
-}
-
vm_dhcpd() {
#from plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh
@@ -233,8 +215,7 @@ if [ -n "$vmnet8" ] ; then
ip link set vmnet8 up
echo "1" >/proc/sys/net/ipv4/conf/vmnet8/forwarding
echo "1" >/proc/sys/net/ipv4/conf/br0/forwarding 2>/dev/null
- # TODO: iptables in stage32?
- # iptables -t nat -A POSTROUTING -o br0 -j MASQUERADE
+ iptables -t nat -A POSTROUTING -o br0 -j MASQUERADE
# /etc/vmware/vmnet-natd-8.mac simply contains a mac like 00:50:56:F1:30:50
$location/vmnet-natd -d /var/run/vmnet-natd-8.pid \
-m /etc/vmware/vmnet-natd-8.mac -c /etc/vmware/nat.conf # or logfile
@@ -254,7 +235,6 @@ vmblock () {
case "$1" in
start)
#start: defines start function for initscript
- vm_dhcpd
setup_network
# adapt_tmpfs
# hack to access the first serial/parallel port
diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build
index 1c9887ef..a4dd8a29 100644
--- a/remote/modules/vmplayer/vmplayer.build
+++ b/remote/modules/vmplayer/vmplayer.build
@@ -1,7 +1,7 @@
fetch_source() {
#mount vmware bundle directory
[ ! -d /mnt/store ] && mkdir -p /mnt/store
- if [ "x$(ls /mnt/store)" == "x" ]; then
+ if [ "x$(ls /mnt/store/vmware/*.bundle)" == "x" ]; then
mount -t nfs -o ro,async,nolock 132.230.8.113:/srv/vmext /mnt/store || perror "Could not mount vmware bundle directory. Exiting."
fi
ARCH="$(uname -m)"
diff --git a/remote/rootfs/rootfs-stage31/data/bin/setup_network b/remote/rootfs/rootfs-stage31/data/bin/setup_network
index 32c1d5ef..2578de4c 100755
--- a/remote/rootfs/rootfs-stage31/data/bin/setup_network
+++ b/remote/rootfs/rootfs-stage31/data/bin/setup_network
@@ -3,13 +3,24 @@
echo "Mac address is '$MAC'"
# setup network
-NWIF="eth0"
+
# set up loopback networking
echo "Setting up loopback"
ip link set dev lo up 2>/dev/null
ip addr add 127.0.0.1/8 dev lo 2>/dev/null
-echo "Setting up $NWIF"
-ip link set dev $NWIF up 2>/dev/null || { echo "No link for $NWIF, dropping to shell.."; setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'; }
+
+echo "Setting up bridge"
+local bridge=br0
+local brnwif=eth0
+local nwifmac=${MAC}
+
+# bridge 0 already defined or some other problem
+brctl addbr ${bridge}
+brctl stp ${bridge} 0
+brctl setfd ${bridge} 0.000000000001
+ip link set addr ${nwifmac} ${bridge}
+ip link set dev ${brnwif} up
+brctl addif ${bridge} ${brnwif}
# analyze ip information from the kernel command line and put parts
# of it into several variables
@@ -30,13 +41,11 @@ if [ -n "$IPINFO" ] ; then
# we might have an idea of the dns server via preboot
dns_srv=$(getip 5)
[ -n "$dns_srv" ] && echo nameserver $dns_srv >/etc/resolv.conf;
- echo -e "# ip configuration written by $0 script:\nclientip=$clientip\n\
-subnet_mask=$subnet_mask\ngateway=$gateway\nserverip=$serverip\n\
-broadcast_address=$broadcast_address" >>/etc/initramfs-setup
# set static ip address
ip addr add $clientip/$(ipcalc -s -p $clientip $subnet_mask|sed s/.*=//) \
- broadcast $broadcast_address dev $NWIF 2>/dev/null
- ip route add default via $gateway 2>/dev/null
+ broadcast $broadcast_address dev $bridge
+ ip link set dev ${bridge} up
+ ip route add default via $gateway
else
NOIPYET="yes"
fi
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
index 713c0a3d..162dcdc2 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
@@ -17,7 +17,7 @@ build() {
pinfo "Searching binaries from config file in system..."
for BIN in ${REQUIRED_BINARIES}
do
- BIN_LOCATION=$(which ${BIN})
+ BIN_LOCATION="$(which ${BIN})"
if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ];
then
get_link_chain ${BIN_LOCATION} >> "${FILELIST}"
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index ced39207..0efbe5e8 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -1,6 +1,7 @@
REQUIRED_MODULES=" kernel"
-REQUIRED_INSTALLED_PACKAGES="nfs-common aufs-tools squashfs-tools whois xfsprogs"
-REQUIRED_BINARIES=" bash
+REQUIRED_INSTALLED_PACKAGES="nfs-common squashfs-tools whois xfsprogs"
+REQUIRED_BINARIES="
+ bash
more
less
agetty
@@ -14,7 +15,6 @@ REQUIRED_BINARIES=" bash
umount
mount.nfs4
umount.nfs4
- mount.aufs
fdisk
mkfs.xfs
rm
@@ -25,12 +25,16 @@ REQUIRED_BINARIES=" bash
ssh
tput
xterm
- ckbcomp
xvidtune
bc
dirname
mkdosfs
+<<<<<<< HEAD
amixer"
+=======
+ iptables
+"
+>>>>>>> e3ecae28eff31fe097cb479ae981e9739cfb15e9
REQUIRED_LIBRARIES=" libcap
libcidn
libcom_err
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
index 2fd5af1a..4d44e2d6 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
@@ -1,35 +1,6 @@
-pinfo "If aufs install fails, run zypper addrepo http://jftp.inai.de/openSUSE_12.3/ j.eng-i586"
REQUIRED_MODULES=" kernel"
-REQUIRED_INSTALLED_PACKAGES="nfs-client aufs squashfs"
+REQUIRED_INSTALLED_PACKAGES="nfs-client xfsprogs squashfs timezone"
REQUIRED_CONTENT_PACKAGES="timezone"
-REQUIRED_BINARIES=" bash
- agetty
- cat
- false
- loadkeys
- setfont
- login
- sulogin
- mount
- umount
- mount.nfs4
- umount.nfs4
- mount.aufs
- rm
- ldd
- strace
- blkid
- more
- modprobe
- rsyslogd
- ps
- scp
- ssh
- tput
- xterm
- xvidtune
- bc
- dirname"
REQUIRED_LIBRARIES=" libcap
libcidn
libcom_err
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-03-01 13:09:04 +0100