Commit 9cfefd27 authored by Christopher Spinrath's avatar Christopher Spinrath
Browse files

Unified customize configuration for 32Bit/64Bit

(LIP Image)
parent 89043483
/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/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
--- a/lib/partman/finish.d/01apt_clone_save 2013-01-12 03:31:22.000000000 +0000
+++ b/lib/partman/finish.d/01apt_clone_save 2013-04-06 16:23:16.103678237 +0000
@@ -39,6 +39,9 @@
close_dialog
done
+#lip patch to prevent the apt-clone save call
+root=""
+
if [ -z "$root" ]; then
# The partition is going to be formatted; there's nothing to preserve.
exit 0
#!/bin/bash
function patch_all()
{
PATCH_DIR="$1"
TARGET_DIR="$2"
if [ ! -d "$PATCH_DIR" ]; then
echo "Nothing to patch here!"
return 0
fi
if [ -z "$TARGET_DIR" ]; then
echo "No target directory given, assuming /"
TARGET_DIR="/"
fi
echo "Patching $TARGET_DIR ..."
for p in "$PATCH_DIR/"*
do
cat "$p" | patch -d "$TARGET_DIR" -p1
done
echo "done."
}
function install_debs()
{
DEB_DIR="$1"
if [ ! -d "$DEB_DIR" ]; then
echo "Nothing to install here!"
return 0
fi
for p in "$DEB_DIR/"*
do
echo "installing $p..."
dpkg -i "$p"
echo "done."
done
}
#!/bin/bash
###################################################################################
# UCK - Ubuntu Customization Kit #
# Copyright (C) 2006-2010 UCK Team #
# #
# UCK is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# UCK is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with UCK. If not, see <http://www.gnu.org/licenses/>. #
###################################################################################
REMASTER_HOME=$1
REMASTER_DIR="$REMASTER_HOME/remaster-root"
INITRD_REMASTER_DIR="$REMASTER_HOME/remaster-initrd"
echo "Using REMASTER_DIR=$REMASTER_DIR, INITRD_REMASTER_DIR=$INITRD_REMASTER_DIR"
IRD="$INITRD_REMASTER_DIR"
SCRIPT_DIR="`dirname $0`"
if [ -e "$SCRIPT_DIR/customize_common" ]; then
source "$SCRIPT_DIR/customize_common"
fi
function install_nmtelekinese()
{
mkdir -p "$IRD/lip/nm"
cp "$SCRIPT_DIR/nmtelekinese/nmtelekinese.desktop" "$IRD/lip/nm"
cp "$SCRIPT_DIR/nmtelekinese/nmtelekinese.py" "$IRD/lip/nm"
cp "$SCRIPT_DIR/nmtelekinese/26mopsmops" "$IRD/scripts/casper-bottom/"
chmod +x "$IRD/scripts/casper-bottom/26mopsmops"
}
function add_no_bootloader_icon()
{
mkdir -p "$IRD/lip/no-bootloader-icon"
cp "$SCRIPT_DIR/no-bootloader-icon/ubiquity-gtkui-no-bootloader.desktop" "$IRD/lip/no-bootloader-icon/"
cp "$SCRIPT_DIR/no-bootloader-icon/25adduser" "$IRD/scripts/casper-bottom/"
chmod +x "$IRD/scripts/casper-bottom/25adduser"
}
mkdir -p "$IRD/lip"
install_nmtelekinese
add_no_bootloader_icon
#copy custom lip hook
cp "$SCRIPT_DIR/initrd_hook/24liphook" "$IRD/scripts/casper-bottom/"
chmod +x "$IRD/scripts/casper-bottom/24liphook"
cp "$SCRIPT_DIR/initrd_hook/ORDER" "$IRD/scripts/casper-bottom/"
patch_all "$SCRIPT_DIR/initrd-patches/" "$IRD"
#!/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/"
--- 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}"
--- 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 ()
#!/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
/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
--- 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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment