Skip to content
Snippets Groups Projects
Commit d838db5c authored by Martin Bellgardt's avatar Martin Bellgardt
Browse files

Merge branch 'master' of www.fsmpi.rwth-aachen.de:lip

parents 347cf3b5 7dbacfa5
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 0 additions and 332 deletions
Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize_iso deleted 100755 → 0
+ 0
− 20
View file @ 347cf3b5
#!/bin/bash
SCRIPT_DIR=`dirname "$0"`
REMASTER_HOME=${1:-~/tmp}
ISO_REMASTER_DIR="$REMASTER_HOME/remaster-iso"
REMASTER_DIR="$REMASTER_HOME/remaster-root"
if [ -e "$SCRIPT_DIR/customize_common" ]; then
source "$SCRIPT_DIR/customize_common"
fi
function create_md5sums()
{
pushd "$REMASTER_DIR"
find . -type f -print0 | sort -z | xargs -0 md5sum > "$REMASTER_HOME/rootfs.md5"
popd
}
#create_md5sums
patch_all "$SCRIPT_DIR/iso-patches/" "$ISO_REMASTER_DIR/"
Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/hybrid deleted 100644 → 0
+ 0
− 1
View file @ 347cf3b5
yes
Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd-patches/01unionstack.patch deleted 100644 → 0
+ 0
− 24
View file @ 347cf3b5
--- a/scripts/casper.org 2013-04-03 10:09:07.000000000 +0200
+++ b/scripts/casper 2013-04-03 00:51:26.000000000 +0200
@@ -43,6 +43,8 @@
export PERSISTENT_PATH="${x#persistent-path=}" ;;
union=*)
export UNIONFS="${x#union=}";;
+ unionstack=*)
+ export UNIONSTACK="${x#unionstack=}";;
ip=*)
STATICIP=${x#ip=}
if [ "${STATICIP}" = "" ]; then
@@ -407,6 +409,12 @@
for image_type in "ext2" "squashfs" "dir" ; do
for image in "${image_directory}"/*."${image_type}"; do
imagename=$(basename "${image}")
+ if [ -n "$UNIONSTACK" ]; then
+ if [ "$(echo $UNIONSTACK | sed "s/$imagename//";)" == "$UNIONSTACK" ]; then
+ log_warning_msg "Filesystem image $imagename not in UNIONSTACK. Ignored."
+ continue
+ fi
+ fi
if [ -d "${image}" ]; then
# it is a plain directory: do nothing
rofsstring="${image}=${roopt}:${rofsstring}"
Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd-patches/02overlayed-rofs.patch deleted 100644 → 0
+ 0
− 67
View file @ 347cf3b5
--- a/scripts/casper 2013-04-04 19:09:09.349995163 +0200
+++ b/scripts/casper 2013-04-04 16:25:34.000000000 +0200
@@ -450,6 +450,10 @@
fi
mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || panic "Can not mount $cowdevice on /cow"
+
+ overlay_mount_dir=/overlay
+ mkdir -p "$overlay_mount_dir"
+
case ${UNIONFS} in
unionfs-fuse)
@@ -463,8 +463,10 @@
overlayfs)
# Mount the layers pairwise from the bottom onto rootmnt,
# for the second and later layers rootmnt forms the lower layer.
+
+ #overlay all readonly file systems first
mounts=""
- for mount in /cow $rofslist
+ for mount in $rofslist
do
mounts="$mount $mounts"
done
@@ -476,9 +482,12 @@
continue
fi
mount -t overlayfs -o "upperdir=$mount,lowerdir=$lower" \
- "$mount" "$rootmnt"
- lower="$rootmnt"
+ "$mount" "$overlay_mount_dir"
+ lower="$overlay_mount_dir"
done
+
+ mount -t overlayfs -o "upperdir=/cow,lowerdir=$lower" \
+ "$mount" "$rootmnt"
;;
esac
@@ -519,15 +528,17 @@
fi
# move the first mount; no head in busybox-initramfs
- for d in $(mount -t squashfs | cut -d\ -f 3); do
- mkdir -p "${rootmnt}/rofs"
- if [ "${UNIONFS}" = unionfs-fuse ]; then
- mount -o bind "${d}" "${rootmnt}/rofs"
- else
- mount -o move "${d}" "${rootmnt}/rofs"
- fi
- break
- done
+ #for d in $(mount -t squashfs | cut -d\ -f 3); do
+ # mkdir -p "${rootmnt}/rofs"
+ # if [ "${UNIONFS}" = unionfs-fuse ]; then
+ # mount -o bind "${d}" "${rootmnt}/rofs"
+ # else
+ # mount -o move "${d}" "${rootmnt}/rofs"
+ # fi
+ # break
+ #done
+ mkdir -p "${rootmnt}/rofs"
+ mount -o move "$lower" "${rootmnt}/rofs"
}
check_dev ()
Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd_hook/24liphook deleted 100755 → 0
+ 0
− 30
View file @ 347cf3b5
#!/bin/sh
PREREQ=""
DESCRIPTION="lip specific stuff"
prereqs()
{
echo "$PREREQ"
}
case $1 in
# get pre-requisites
prereqs)
prereqs
exit 0
;;
esac
. /scripts/casper-functions
load_confmodule
log_begin_msg "$DESCRIPTION"
#copy desktop file for the no-bootloader-icon (required in 25adduser)
cp /lip/no-bootloader-icon/ubiquity-gtkui-no-bootloader.desktop /root/usr/share/applications/
#TODO: install ubiquity here?
log_end_msg
Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd_hook/ORDER deleted 100644 → 0
+ 0
− 80
View file @ 347cf3b5
/scripts/casper-bottom/01integrity_check
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/05mountpoints
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/05mountpoints_lupin
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/07remove_oem_config
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/10custom_installation
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/10ntfs_3g
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/12fstab
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/13swap
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/14locales
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/15autologin
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/18hostname
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/19keyboard
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/20xconfig
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/22gnome_panel_data
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/22screensaver
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/22serialtty
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/22sslcert
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/23etc_modules
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/23networking
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/24preseed
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/24liphook
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/25adduser
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/25configure_init
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/26disable_user_menu
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/26mopsmops
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/30accessibility
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/31disable_update_notifier
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/32disable_hibernation
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/33enable_apport_crashes
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/34disable_kde_services
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/35fix_language_selector
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/36disable_trackerd
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/40install_driver_updates
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/41apt_cdrom
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/43disable_updateinitramfs
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/44pk_allow_ubuntu
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/45jackd2
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/48kubuntu_disable_restart_notifications
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/49kubuntu_mobile_session
[ -e /conf/param.conf ] && . /conf/param.conf
/scripts/casper-bottom/50ubiquity-bluetooth-agent
[ -e /conf/param.conf ] && . /conf/param.conf
Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/iso-patches/ubiquity-keep-installed.patch deleted 100644 → 0
+ 0
− 9
View file @ 347cf3b5
--- a/preseed/ubuntu.seed 2013-02-13 23:21:04.000000000 +0100
+++ b/preseed/ubuntu.seed 2013-04-07 14:11:15.429958827 +0200
@@ -6,5 +6,5 @@
# application packages pulled in by language packs. Given that we clearly
# have the space to include them on the DVD, they're useful and we might as
# well keep them installed.
-ubiquity ubiquity/keep-installed string icedtea6-plugin openoffice.org
+ubiquity ubiquity/keep-installed string icedtea6-plugin openoffice.org gparted kpartx kpartx-boot libgtkmm apt-clone cryptsetup dpkg-repack gir1.2-json-1.0 gir1.2-xkl-1.0 gir1.2-timezonemap-1.0 keyutils libnss3-1d python-pyicu realpath
d-i base-installer/kernel/altmeta string lts-raring
Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/iso_description deleted 100644 → 0
+ 0
− 1
View file @ 347cf3b5
LIP WS1314 64bit
Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/language_packs deleted 100644 → 0
+ 0
− 2
View file @ 347cf3b5
de
en
Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/lip_sources.list deleted 100644 → 0
+ 0
− 54
View file @ 347cf3b5
# deb cdrom:[Ubuntu 12.04 LTS _Precise Pangolin_ - Release i386 (20120423)]/ precise main restricted
# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
# newer versions of the distribution.
deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise main restricted
deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise main restricted
## Major bug fix updates produced after the final release of the
## distribution.
deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates main restricted
deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates main restricted
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
## team. Also, please note that software in universe WILL NOT receive any
## review or updates from the Ubuntu security team.
deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise universe
deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise universe
deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates universe
deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates universe
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
## team, and may not be under a free licence. Please satisfy yourself as to
## your rights to use the software. Also, please note that software in
## multiverse WILL NOT receive any review or updates from the Ubuntu
## security team.
deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise multiverse
deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise multiverse
deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates multiverse
deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates multiverse
## N.B. software from this repository may not have been tested as
## extensively as that contained in the main release, although it includes
## newer versions of some applications which may provide useful features.
## Also, please note that software in backports WILL NOT receive any review
## or updates from the Ubuntu security team.
deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security main restricted
deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security main restricted
deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security universe
deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security universe
deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security multiverse
deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security multiverse
## Uncomment the following two lines to add software from Canonical's
## 'partner' repository.
## This software is not part of Ubuntu, but is offered by Canonical and the
## respective vendors as a service to Ubuntu users.
# deb http://archive.canonical.com/ubuntu precise partner
# deb-src http://archive.canonical.com/ubuntu precise partner
## This software is not part of Ubuntu, but is offered by third-party
## developers who want to ship their latest software.
deb http://extras.ubuntu.com/ubuntu precise main
deb-src http://extras.ubuntu.com/ubuntu precise main
Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/livecd_locales deleted 100644 → 0
+ 0
− 2
View file @ 347cf3b5
de
en
Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/nmtelekinese/26mopsmops deleted 100755 → 0
+ 0
− 41
View file @ 347cf3b5
#!/bin/sh
PREREQ=""
DESCRIPTION="Enforcing MoPS disconnect"
prereqs()
{
echo "$PREREQ"
}
case $1 in
# get pre-requisites
prereqs)
prereqs
exit 0
;;
esac
. /scripts/casper-functions
load_confmodule
log_begin_msg "$DESCRIPTION"
# Starting nmtelekinese with the MoPS network
cp /lip/nm/nmtelekinese.py /root/usr/bin/
chroot /root mkdir -m 755 -p /home/${USERNAME}/.config/autostart
cp /lip/nm/nmtelekinese.desktop /root/home/${USERNAME}/.config/autostart
chroot /root chmod 755 /home/${USERNAME}/.config/autostart/nmtelekinese.desktop
chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.config
# Denying all connections to redirector.wlan.rwth-aachen.de
mount -t proc none /root/proc
chroot /root modprobe ip_tables
chroot /root modprobe iptable_filter
chroot /root modprobe ipt_REJECT
chroot /root iptables -I OUTPUT 1 -d 137.226.8.34 -j REJECT --reject-with icmp-host-prohibited
chroot /root iptables -I OUTPUT 1 -d 137.226.8.34 -p tcp -j REJECT --reject-with tcp-rst
umount /root/proc
log_end_msg
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment