From e20120480dc26d3bb669c27cb9bf47bb6b765552 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Wed, 5 Jun 2019 17:00:04 +0000 Subject: [PATCH] Imported 2.592 No reason for CPC update specified. --- debian/changelog | 29 ++ debian/tests/default-bootstraps | 7 - live-build/auto/build | 110 +----- live-build/auto/config | 141 +------- .../hooks/25-create-generic-initrd.chroot | 4 - .../hooks/00-uid-gid-fix.chroot_early | 295 ---------------- .../hooks/01-setup_user.chroot | 44 --- .../hooks/02-add_user_to_groups.chroot | 8 - .../hooks/03-boot_with_systemd.chroot | 11 - .../hooks/05-create_minimal_fstab.chroot | 6 - .../07-configure-system-image-client.chroot | 7 - .../hooks/08-etc-writable.chroot | 15 - .../hooks/10-remove-documentation.binary | 8 - .../hooks/11-remove-extra-packages.chroot | 6 - .../hooks/13-set-locale.chroot | 7 - .../hooks/14-set-motd.chroot | 14 - .../hooks/15-remove-grub-common.chroot | 4 - .../hooks/20-extra-files.chroot | 8 - .../hooks/400-create-apt-get-warning.binary | 19 -- .../hooks/45-add-sudo-group-nm.chroot | 15 - .../500-move-kernel-to-device-tar.binary | 80 ----- .../hooks/99zz-check-uid-gid.chroot | 52 --- .../includes.chroot/etc/hosts | 9 - .../90-desktop-next-autologin.conf | 2 - .../media-rack.lower.mount | 1 - .../local-fs.target.wants/media-rack.mount | 1 - .../local-fs.target.wants/media-region.mount | 1 - .../lib/systemd/system/media-rack.lower.mount | 5 - .../usr/lib/systemd/system/media-rack.mount | 9 - .../systemd/system/media-region.lower.mount | 5 - .../usr/lib/systemd/system/media-region.mount | 10 - live-build/ubuntu-touch-custom | 1 - .../hooks/00-uid-gid-fix.chroot_early | 315 ------------------ .../ubuntu-touch/hooks/01-setup_user.chroot | 47 --- .../hooks/02-add_user_to_groups.chroot | 104 ------ .../ubuntu-touch/hooks/03-etc-writable.chroot | 15 - .../ubuntu-touch/hooks/20-extra-files.chroot | 9 - .../hooks/45-add-sudo-group-nm.chroot | 15 - .../ubuntu-touch/hooks/48-setup-env.chroot | 24 -- .../50-upower-poweroff-percentages.chroot | 10 - .../hooks/60-install-click.binary | 9 - .../hooks/60-install-click.chroot | 81 ----- .../hooks/70-reconfigure-autopilot.chroot | 16 - .../hooks/80-enable-libhybris.chroot | 7 - .../90-precompile-apparmor-policies.chroot | 55 --- .../hooks/99-remove-documentation.chroot | 11 - .../ubuntu-touch/hooks/99-remove-lists.binary | 9 - .../hooks/99zz-check-uid-gid.chroot | 55 --- .../includes.chroot/etc/default/locale | 1 - .../ubuntu-touch/includes.chroot/etc/hostname | 1 - .../ubuntu-touch/includes.chroot/etc/hosts | 10 - .../lightdm/lightdm.conf.d/90-phablet.conf | 3 - .../var/cache/apparmor/.features | 52 --- 53 files changed, 36 insertions(+), 1747 deletions(-) delete mode 100755 live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early delete mode 100755 live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot delete mode 100755 live-build/ubuntu-desktop-next/hooks/02-add_user_to_groups.chroot delete mode 100755 live-build/ubuntu-desktop-next/hooks/03-boot_with_systemd.chroot delete mode 100755 live-build/ubuntu-desktop-next/hooks/05-create_minimal_fstab.chroot delete mode 100755 live-build/ubuntu-desktop-next/hooks/07-configure-system-image-client.chroot delete mode 100644 live-build/ubuntu-desktop-next/hooks/08-etc-writable.chroot delete mode 100644 live-build/ubuntu-desktop-next/hooks/10-remove-documentation.binary delete mode 100644 live-build/ubuntu-desktop-next/hooks/11-remove-extra-packages.chroot delete mode 100644 live-build/ubuntu-desktop-next/hooks/13-set-locale.chroot delete mode 100644 live-build/ubuntu-desktop-next/hooks/14-set-motd.chroot delete mode 100644 live-build/ubuntu-desktop-next/hooks/15-remove-grub-common.chroot delete mode 100755 live-build/ubuntu-desktop-next/hooks/20-extra-files.chroot delete mode 100644 live-build/ubuntu-desktop-next/hooks/400-create-apt-get-warning.binary delete mode 100755 live-build/ubuntu-desktop-next/hooks/45-add-sudo-group-nm.chroot delete mode 100644 live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary delete mode 100755 live-build/ubuntu-desktop-next/hooks/99zz-check-uid-gid.chroot delete mode 100644 live-build/ubuntu-desktop-next/includes.chroot/etc/hosts delete mode 100644 live-build/ubuntu-desktop-next/includes.chroot/usr/share/lightdm/lightdm.conf.d/90-desktop-next-autologin.conf delete mode 120000 live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount delete mode 120000 live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.mount delete mode 120000 live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-region.mount delete mode 100644 live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.lower.mount delete mode 100644 live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.mount delete mode 100644 live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.lower.mount delete mode 100644 live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.mount delete mode 120000 live-build/ubuntu-touch-custom delete mode 100755 live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early delete mode 100755 live-build/ubuntu-touch/hooks/01-setup_user.chroot delete mode 100755 live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot delete mode 100755 live-build/ubuntu-touch/hooks/03-etc-writable.chroot delete mode 100755 live-build/ubuntu-touch/hooks/20-extra-files.chroot delete mode 100755 live-build/ubuntu-touch/hooks/45-add-sudo-group-nm.chroot delete mode 100755 live-build/ubuntu-touch/hooks/48-setup-env.chroot delete mode 100755 live-build/ubuntu-touch/hooks/50-upower-poweroff-percentages.chroot delete mode 100755 live-build/ubuntu-touch/hooks/60-install-click.binary delete mode 100755 live-build/ubuntu-touch/hooks/60-install-click.chroot delete mode 100755 live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot delete mode 100755 live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot delete mode 100755 live-build/ubuntu-touch/hooks/90-precompile-apparmor-policies.chroot delete mode 100755 live-build/ubuntu-touch/hooks/99-remove-documentation.chroot delete mode 100755 live-build/ubuntu-touch/hooks/99-remove-lists.binary delete mode 100755 live-build/ubuntu-touch/hooks/99zz-check-uid-gid.chroot delete mode 100644 live-build/ubuntu-touch/includes.chroot/etc/default/locale delete mode 100644 live-build/ubuntu-touch/includes.chroot/etc/hostname delete mode 100644 live-build/ubuntu-touch/includes.chroot/etc/hosts delete mode 100644 live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf.d/90-phablet.conf delete mode 100644 live-build/ubuntu-touch/includes.chroot/var/cache/apparmor/.features diff --git a/debian/changelog b/debian/changelog index 924dc2b0..71d6829c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +livecd-rootfs (2.592) eoan; urgency=medium + + * Drop trying to mount removed maas squashfs. + * Stop overriding initramfs compression default to lzma. LP: #1831736 + * Do not force lzma on ubuntu-core builds, the compress format default + should be set universally inside initramfs-tools-ubuntu-core package + instead of getting duplicated multiple times all over the place. + + -- Dimitri John Ledkov Wed, 05 Jun 2019 13:55:06 +0100 + +livecd-rootfs (2.591) eoan; urgency=medium + + * Fix typpo when dropping jasper. + + -- Dimitri John Ledkov Tue, 04 Jun 2019 23:53:12 +0100 + +livecd-rootfs (2.590) eoan; urgency=medium + + * Drop dead wubi subproject. + * Drop dead jasper subproject. + * Drop old arm platforms. + * Drop ubuntu-desktop-next configs + * Drop ubuntu-desktop-next hooks + * Drop ubuntu-touch configs + * Drop ubuntu-touch hooks + * Drop ubuntu-rtm configs + + -- Dimitri John Ledkov Tue, 04 Jun 2019 23:45:43 +0100 + livecd-rootfs (2.589) eoan; urgency=medium * Add support for the 'kassel' subflavor of UC18 images. diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 752d6404..0115ced1 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -32,8 +32,6 @@ ALL_TRIPLETS=" ubuntu-core:system-image:ubuntu-core ubuntu-cpc::ubuntu-cpc ubuntu-cpc:minimized:ubuntu-cpc - ubuntu-desktop-next:system-image:ubuntu-desktop-next - ubuntu-desktop-next::ubuntu-desktop-next ubuntu-dvd:: ubuntu-gnome:: ubuntukylin:: @@ -43,11 +41,6 @@ ALL_TRIPLETS=" ubuntu-mate-live:: ubuntu-netbook:: ubuntu-server:: - ubuntu-server:ubuntu-rtm: - ubuntu-server:ubuntu-rtm/foo: - ubuntu-server:wubi: - ubuntu-touch-custom::ubuntu-touch-custom - ubuntu-touch::ubuntu-touch xubuntu::" if [ -z "$SELECTED_TRIPLETS" ]; then diff --git a/live-build/auto/build b/live-build/auto/build index 4f7393af..e27491cf 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -393,14 +393,6 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS ;; esac - if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then - if [ "$ARCH" = "armhf" ]; then - INFO_DESC="$(lsb_release -d -s)" - echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/etc/media-info - mkdir -p chroot/var/log/installer - Chroot chroot "ln -s /etc/media-info /var/log/installer/media-info" - fi - fi if [ "$PROJECT" = "ubuntu-cpc" ]; then if [ "${SUBPROJECT:-}" = minimized ]; then BUILD_NAME=minimal @@ -517,12 +509,6 @@ EOF fi fi -if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then - (cd "binary/$INITFS/custom.dir/" && tar -c --sort=name --xattrs *) | \ - gzip -9 --rsyncable > "$PREFIX.custom.tar.gz" - chmod 644 "$PREFIX.custom.tar.gz" -fi - # '--initramfs none' produces different manifest names. if [ -e "binary/$INITFS/filesystem.packages" ]; then ./config/snap-seed-parse "chroot/" "binary/${INITFS}/filesystem.packages" @@ -537,11 +523,11 @@ if [ -e "binary/$INITFS/filesystem.packages-remove" ]; then fi fi -# ubuntu-core and ubuntu-desktop-next splits kernel stuff into a "device" tarball so +# ubuntu-core splits kernel stuff into a "device" tarball so # at this point we reset it to "none" as all the work to extract it was done already # in a binary hook case $PROJECT:${SUBPROJECT:-} in - ubuntu-core:system-image|ubuntu-desktop-next:system-image) + ubuntu-core:system-image) # create device tarball (for snappy only atm) if [ "$PROJECT:$SUBPROJECT" = "ubuntu-core:system-image" ]; then @@ -604,8 +590,6 @@ case $PROJECT:${SUBPROJECT:-} in Chroot chroot "apt-get -y autoremove" rm -rf chroot/boot/initrd.img* chroot/boot/vmlinu?-* chroot/lib/modules/* \ chroot/boot/abi-* chroot/boot/System.map-* chroot/boot/config-* - mkdir -p chroot/etc/initramfs-tools/conf.d - echo "COMPRESS=lzma" >chroot/etc/initramfs-tools/conf.d/snappy-device-tarball.conf # install needed packages and the kernel itself Chroot chroot "apt-get -y install initramfs-tools-ubuntu-core linux-firmware xz-utils" @@ -838,36 +822,6 @@ if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then fi case $SUBARCH in - ac100) - # create the md5sum and size files for which we are actually doing all this - md5sum $PREFIX.rootfs.tar.gz >chroot/installer.md5 - wc -c $PREFIX.rootfs.tar.gz >chroot/installer.size - - INFO_DESC="$(lsb_release -d -s)" - INFO_STAMP=$(date +20%y%m%d-%H:%M) - - echo "$INFO_DESC - $ARCH ($INFO_STAMP)" >chroot/media-info - - # make sure update-initramfs feels cosy and warm in the environment - lb chroot_proc install "$@" - lb chroot_sysfs install "$@" - lb chroot_devpts install "$@" - - # re-create initrd to contain the installer.md5 file - Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k all -t -u -v" - - # create boot.img - Chroot chroot "abootimg --create /boot/installer-${KVERS}.img -f /boot/bootimg.cfg-$SUBARCH -r /boot/initrd.img-${KVERS} -k /boot/vmlinuz-${KVERS}" - - # clean up - lb chroot_devpts remove "$@" - lb chroot_sysfs remove "$@" - lb chroot_proc remove "$@" - - cp "chroot/boot/installer-${KVERS}.img" "$PREFIX.bootimg-$FLAVOUR" - ln -sf "$PREFIX.bootimg-$FLAVOUR" "$PREFIX.bootimg" - ;; - raspi2|raspi3) # copy the kernel and initrd to a predictable directory for # ubuntu-image consumption. In some cases, like in pi2/3 @@ -884,66 +838,6 @@ case $SUBARCH in ;; esac -if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then - sourceslist="chroot/etc/apt/sources.list" - - lb chroot_proc install "$@" - lb chroot_sysfs install "$@" - lb chroot_devpts install "$@" - - if [ -e "$PREFIX.manifest" ]; then - Chroot chroot "click list" | while read line; do - echo "click:$line" >>"$PREFIX.manifest" - done - fi - - if [ -e chroot/etc/resolv.conf ]; then - mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig - fi - if [ -e /etc/resolv.conf ]; then - cp /etc/resolv.conf chroot/etc/resolv.conf - fi - - mv "${sourceslist}" "${sourceslist}.orig" - mv "${sourceslist}.d" "${sourceslist}.d.orig" - echo "deb $LB_PARENT_MIRROR_CHROOT ${LB_DISTRIBUTION} main universe multiverse restricted" >$sourceslist - Chroot chroot "apt-get -y update" - Chroot chroot "apt-get -y install android" - - if [ "$ARCH" = "armhf" ]; then - touchsubarches="flo mako generic" - for subarch in $touchsubarches; do - cp -v chroot/usr/share/android/product/*-preinstalled-system-armel+${subarch}.img\ - "${PREFIX}.system-armel+${subarch}.img" - cp -v chroot/usr/share/android/product/*-preinstalled-recovery-armel+${subarch}.img\ - "${PREFIX}.recovery-armel+${subarch}.img" - cp -v chroot/usr/share/android/product/*-preinstalled-boot-armhf+${subarch}.img\ - "${PREFIX}.boot-armhf+${subarch}.img" - # drop this following line once cdimage can handle -boot-*.img - cp -v "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}" - done - fi - if [ "$ARCH" = "i386" ]; then - touchsubarches="generic_x86" - for subarch in $touchsubarches; do - cp -v chroot/usr/share/android/product/*-preinstalled-system-i386+${subarch}.img\ - "${PREFIX}.system-i386+${subarch}.img" - cp -v chroot/usr/share/android/product/*-preinstalled-recovery-i386+${subarch}.img\ - "${PREFIX}.recovery-i386+${subarch}.img" - cp -v chroot/usr/share/android/product/*-preinstalled-boot-i386+${subarch}.img\ - "${PREFIX}.boot-i386+${subarch}.img" - # drop this following line once cdimage can handle -boot-*.img - cp -v "${PREFIX}.boot-i386+${subarch}.img" "${PREFIX}.bootimg-${subarch}" - done - fi - - lb chroot_devpts remove "$@" - lb chroot_sysfs remove "$@" - lb chroot_proc remove "$@" - - rm -rf chroot/etc/init/*.override -fi - # LTSP chroot building (only in 32bit and for Edubuntu (DVD)) case $PROJECT in edubuntu-dvd) diff --git a/live-build/auto/config b/live-build/auto/config index 70b4a420..de935248 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -302,23 +302,7 @@ case $IMAGEFORMAT in ext2|ext3|ext4) OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT" PREINSTALLED=true - case ${SUBPROJECT:-} in - wubi) - add_package install lupin-support - COMPONENTS='main restricted universe multiverse' - ;; - *) - case $PROJECT in - ubuntu-cpc) - ;; - *) - add_package live jasper - ;; - esac - ;; - esac ;; - plain) case $PROJECT:${SUBPROJECT:-} in ubuntu-server:live) @@ -421,7 +405,7 @@ case $IMAGEFORMAT in ;; *) case $PROJECT in - ubuntu-server|ubuntu-touch|ubuntu-touch-custom) + ubuntu-server) ;; ubuntu) if [ "$SUBPROJECT" != "canary" ]; then @@ -459,7 +443,7 @@ if [ "$PREINSTALLED" = "true" ]; then ubuntu-server) add_package live oem-config-debconf ubiquity-frontend-debconf ;; - ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-touch-custom|ubuntu-cpc|ubuntu-desktop-next) + ubuntu-core|ubuntu-base|base|ubuntu-cpc) ;; *) add_package live oem-config-gtk ubiquity-frontend-gtk @@ -521,12 +505,6 @@ if ! [ -e config/germinate-output/structure ]; then ${COMPONENTS:+-c "$COMPONENTS"} -a $ARCH) fi -case $PROJECT in - base|edubuntu|edubuntu-dvd|kubuntu|kubuntu-active|kubuntu-dvd|kubuntu-plasma5|lubuntu|mythbuntu|ubuntu|ubuntu-budgie|ubuntu-desktop-next|ubuntu-dvd|ubuntu-gnome|ubuntu-mate|ubuntu-netbook|ubuntukylin|ubuntustudio-dvd|xubuntu) - INITRAMFS_COMPRESSION="lzma" - ;; -esac - case $PROJECT in ubuntu|ubuntu-dvd) @@ -559,25 +537,6 @@ case $PROJECT in esac ;; - ubuntu-desktop-next) - add_task install minimal standard ubuntu-desktop-next ubuntu-sdk-libs - COMPONENTS='main restricted universe' - LIVE_TASK='ubuntu-touch-live' - KERNEL_FLAVOURS=generic - case $ARCH in - amd64) add_package live linux-signed-generic ;; - esac - - # system image snappy desktop next image - # mvo: This is for cron.daily-preinstalled - # CDIMAGE_PREINSTALLED is not passed from build.py - # and PREINSTALLED means something different. So - # we use SUBPROJECT to pass on the information - if [ "${SUBPROJECT:-}" = "system-image" ]; then - OPTS="${OPTS:+$OPTS }--linux-packages=linux-image" - fi - ;; - kubuntu|kubuntu-dvd) add_task install minimal standard add_task install kubuntu-desktop @@ -777,44 +736,6 @@ case $PROJECT in OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" ;; - ubuntu-touch|ubuntu-touch-custom) - HINTS="packagekit ubuntu-system-settings" - case $ARCH in - amd64|i386) - HINTS="$HINTS qml-module-ubuntu-components-gles unity8" - ;; - esac - add_package install ubuntu-minimal ubuntu-touch $HINTS - - COMPONENTS='main restricted universe' - BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu' - export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg' - OPTS="${OPTS:+$OPTS }--apt-recommends false" - OPTS="${OPTS:+$OPTS }--compression gzip" - OPTS="${OPTS:+$OPTS }--system normal" - OPTS="${OPTS:+$OPTS }--zsync false" - - # TODO cjwatson 2014-07-17: This is a bit of an abuse of - # SUBPROJECT, but it's a handy thing that launchpad-buildd - # already passes through to us that we weren't otherwise - # using here. - case ${SUBPROJECT:-} in - ubuntu-rtm/dogfood) - MIRROR=http://derived-archive.dogfood.content.paddev.net/ubuntu-rtm/ - OPTS="${OPTS:+$OPTS }--apt-secure false" - OPTS="${OPTS:+$OPTS }--mirror-chroot-security ${MIRROR}" - OPTS="${OPTS:+$OPTS }--mirror-binary-security ${MIRROR}" - OPTS="${OPTS:+$OPTS }--mirror-binary ${MIRROR}" - ;; - ubuntu-rtm) - MIRROR=http://derived.archive.canonical.com/ubuntu-rtm/ - OPTS="${OPTS:+$OPTS }--mirror-chroot-security ${MIRROR}" - OPTS="${OPTS:+$OPTS }--mirror-binary-security ${MIRROR}" - OPTS="${OPTS:+$OPTS }--mirror-binary ${MIRROR}" - ;; - esac - ;; - ubuntu-cpc) if [ "${SUBPROJECT:-}" = minimized ]; then add_task install cloud-image @@ -959,39 +880,9 @@ case $PROJECT in esac case $ARCH in - armel|armhf|arm64) + armhf|arm64) KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}" case $SUBARCH in - dove) - BINARY_REMOVE_LINUX=false - ;; - omap) - add_package install u-boot-linaro-omap3-beagle u-boot-tools - BINARY_REMOVE_LINUX=false - ;; - omap4) - case $PROJECT in - ubuntu-server|ubuntu-core|base) - add_package install u-boot-linaro-omap4-panda u-boot-tools - ;; - *) - add_package install u-boot-linaro-omap4-panda u-boot-tools pvr-omap4 - ;; - esac - BINARY_REMOVE_LINUX=false - ;; - mx5) - COMPONENTS='main restricted universe' - KERNEL_FLAVOURS=linaro-lt-mx5 - add_package install flash-kernel u-boot-linaro-mx53loco u-boot-tools - BINARY_REMOVE_LINUX=false - ;; - ac100) - COMPONENTS='main restricted universe multiverse' - add_package install zram-config abootimg - add_package live ac100-tarball-installer - BINARY_REMOVE_LINUX=false - ;; raspi2) COMPONENTS='main restricted universe multiverse' add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant @@ -1009,7 +900,7 @@ case $ARCH in esac case $PROJECT:${SUBPROJECT:-} in - ubuntu-server:*|ubuntu-base:*|ubuntu-touch:*|ubuntu-touch-custom:*) + ubuntu-server:*|ubuntu-base:*) OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" KERNEL_FLAVOURS=none BINARY_REMOVE_LINUX=false @@ -1030,12 +921,6 @@ case $PROJECT in ;; esac -case ${SUBPROJECT:-} in - wubi) - add_binary_hook build-wubildr - ;; -esac - lb config noauto \ --mode ubuntu \ --distribution "$SUITE" \ @@ -1207,7 +1092,7 @@ EOF fi ;; - ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*|ubuntu-server:live) + ubuntu-core:system-image|ubuntu-cpc:*|ubuntu-server:live) cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \ config/ @@ -1304,22 +1189,6 @@ EOF fi fi -case ${SUBPROJECT:-} in - ubuntu-rtm|ubuntu-rtm/*) - # debootstrap doesn't know about ubuntu-rtm series directly. Rather - # than having to teach it, we employ a few hacks to make it use the - # Ubuntu script instead. - mkdir -p config/fake_debootstrap_dir/scripts - ln -s /usr/share/debootstrap/devices.tar.gz \ - config/fake_debootstrap_dir/ - ln -s /usr/share/debootstrap/functions config/fake_debootstrap_dir/ - ln -s /usr/share/debootstrap/scripts/gutsy \ - "config/fake_debootstrap_dir/scripts/$SUITE" - echo 'export DEBOOTSTRAP_DIR="$PWD/config/fake_debootstrap_dir"' \ - >> config/bootstrap - ;; -esac - if [ "$PREINSTALLED" = "true" ]; then if [ -n "$PREINSTALL_POOL_SEEDS" ]; then UNWANTED_SEEDS="${LIVE_TASK:+$LIVE_TASK }boot installer required" diff --git a/live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot b/live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot index c967bc7c..c9d95c0a 100755 --- a/live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot +++ b/live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot @@ -8,10 +8,6 @@ IVER="$(dpkg -s initramfs-tools-ubuntu-core | \ # fail the build if we did not find the snappy initrd package [ -n "$IVER" ] || exit 1 -# force lzma -mkdir -p /etc/initramfs-tools/conf.d -echo "COMPRESS=lzma" >/etc/initramfs-tools/conf.d/snappy-generic-initrd.conf - update-initramfs.REAL -c -kcore-$IVER -v cd /boot diff --git a/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early deleted file mode 100755 index 5615383b..00000000 --- a/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early +++ /dev/null @@ -1,295 +0,0 @@ -#!/bin/sh -eu - -ERRCNT="" - -# Known good post-debootstrap values -passwd_bootstrap="e6075a0d2a38e214ae5e9a5545f7eda3" -shadow_bootstrap="7fa48d7fb0e3a1ede9c98ff7b1b33622" -group_bootstrap="5fd842058cd526ddaf51c2a61870c12a" -gshadow_bootstrap="3145b72315c7306edb13bf546bb350b9" - -# Current post-debootstrap values -passwd_hash=$(set -- $(md5sum /etc/passwd) && echo $1) -shadow_hash=$(set -- $(cat /etc/shadow | sed "s/:.*:0:99999:/:0:99999:/g" | md5sum) && echo $1) -group_hash=$(set -- $(md5sum /etc/group) && echo $1) -gshadow_hash=$(set -- $(md5sum /etc/gshadow) && echo $1) - -# /etc/passwd -if [ "$passwd_bootstrap" = "$passwd_hash" ]; then - cat > /etc/passwd <&2 - echo "The output below might help to resolve the issue" >&2 - cat /etc/passwd - echo "passwd md5sum: $passwd_hash" >&2 - ERRCNT=1 -fi - -# /etc/shadow -if [ "$shadow_bootstrap" = "$shadow_hash" ]; then - cat > /etc/shadow <&2 - echo "The output below might help to resolve the issue" >&2 - cat /etc/shadow - echo "shadow md5sum: $shadow_hash" >&2 - ERRCNT=1 -fi - -# /etc/group -if [ "$group_bootstrap" = "$group_hash" ]; then - cat > /etc/group <&2 - echo "The output below might help to resolve the issue" >&2 - cat /etc/group - echo "group md5sum: $group_hash" >&2 - ERRCNT=1 -fi - -# /etc/gshadow -if [ "$gshadow_bootstrap" = "$gshadow_hash" ]; then - cat > /etc/gshadow <&2 - echo "The output below might help to resolve the issue" >&2 - cat /etc/gshadow - echo "gshadow md5sum: $gshadow_hash" >&2 - ERRCNT=1 -fi - -if [ -n "$ERRCNT" ]; then - echo "There were changes to the password database," >&2 - echo "please adjust the values in the livecd-rootfs source in the file:" >&2 - echo "live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early" >&2 - echo >&2 - echo "Please check also if a maintainer script of the package" >&2 - echo "that added these entries perhaps created a home directory and," >&2 - echo "if needed, add code for creation of it to the above hook" >&2 - exit 1 -fi - -# Create some missing directories -mkdir -p /var/lib/lightdm -chown lightdm:lightdm /var/lib/lightdm -chmod 750 /var/lib/lightdm - -mkdir -p /var/lib/usermetrics -chown usermetrics:usermetrics /var/lib/usermetrics -chmod 750 /var/lib/usermetrics - -echo "adjusting ownership of /var/log" >&2 -chown root:syslog /var/log -ls -ln /var | grep log >&2 - -# Record the current state for later comparison -for file in /etc/passwd /etc/shadow /etc/group /etc/gshadow; do - rm -f ${file}- - cp ${file} ${file}.orig -done diff --git a/live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot b/live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot deleted file mode 100755 index 26564c3c..00000000 --- a/live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -x - -set -e - -USER=ubuntu -UGID=1000 - -echo "I: creating default user $USER" -adduser --gecos $USER --disabled-login $USER --uid $UGID - -mkdir -p /home/$USER/Music -mkdir -p /home/$USER/Pictures -mkdir -p /home/$USER/Videos -mkdir -p /home/$USER/Downloads -mkdir -p /home/$USER/Documents -chown -R $UGID:$UGID /home/$USER - -# Enable libnss-extrusers -sed -i 's/^group:.*compat/\0 extrausers/' /etc/nsswitch.conf -sed -i 's/^passwd:.*compat/\0 extrausers/' /etc/nsswitch.conf -sed -i 's/^shadow:.*compat/\0 extrausers/' /etc/nsswitch.conf - -# Move user from /etc to extrausers location -grep "^$USER" /etc/group >> /var/lib/extrausers/group -grep "^$USER" /etc/passwd >> /var/lib/extrausers/passwd -grep "^$USER" /etc/shadow >> /var/lib/extrausers/shadow -grep "^$USER" /etc/gshadow >> /var/lib/extrausers/gshadow -chmod 0644 /var/lib/extrausers/group -chmod 0644 /var/lib/extrausers/passwd -chmod 0640 /var/lib/extrausers/shadow -chmod 0640 /var/lib/extrausers/gshadow -chown root:shadow /var/lib/extrausers/shadow -chown root:shadow /var/lib/extrausers/gshadow -sed -i "/^$USER/d" /etc/group -sed -i "/^$USER/d" /etc/passwd -sed -i "/^$USER/d" /etc/shadow -sed -i "/^$USER/d" /etc/gshadow -touch /var/lib/extrausers/subuid -touch /var/lib/extrausers/subgid - -# needs to run *after* the user was moved out to /var/lib/extrausers -echo "I: set user $USER password to $USER" -echo "$USER:$USER" | chpasswd - diff --git a/live-build/ubuntu-desktop-next/hooks/02-add_user_to_groups.chroot b/live-build/ubuntu-desktop-next/hooks/02-add_user_to_groups.chroot deleted file mode 100755 index 232fab3e..00000000 --- a/live-build/ubuntu-desktop-next/hooks/02-add_user_to_groups.chroot +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -x - -USER=ubuntu - -DEFGROUPS="sudo,adm,dialout,cdrom,plugdev,audio,dip,video" - -echo "I: add $USER to ($DEFGROUPS) group(s)" -usermod -a -G ${DEFGROUPS} ${USER} diff --git a/live-build/ubuntu-desktop-next/hooks/03-boot_with_systemd.chroot b/live-build/ubuntu-desktop-next/hooks/03-boot_with_systemd.chroot deleted file mode 100755 index f19164f0..00000000 --- a/live-build/ubuntu-desktop-next/hooks/03-boot_with_systemd.chroot +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -x - -# Boot using systemd and disable quiet boot -# to see what is happening. -systemd=/lib/systemd/systemd -if [ -f /etc/default/grub ]; then - sed -i \ - -e "s,^\\([ ]*GRUB_CMDLINE_LINUX\\)=\"\"$,\\1=\"init=$systemd\",g" \ - -e 's,^\([ ]*GRUB_CMDLINE_LINUX_DEFAULT\)="quiet splash",\1="",g' \ - /etc/default/grub -fi diff --git a/live-build/ubuntu-desktop-next/hooks/05-create_minimal_fstab.chroot b/live-build/ubuntu-desktop-next/hooks/05-create_minimal_fstab.chroot deleted file mode 100755 index 461c752f..00000000 --- a/live-build/ubuntu-desktop-next/hooks/05-create_minimal_fstab.chroot +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -x - -cat >>/etc/fstab</etc/default/locale</etc/motd<&2 -mkdir -p /lib/modules -mkdir -p /lib/firmware -mkdir -p /writable diff --git a/live-build/ubuntu-desktop-next/hooks/400-create-apt-get-warning.binary b/live-build/ubuntu-desktop-next/hooks/400-create-apt-get-warning.binary deleted file mode 100644 index 94e88a1f..00000000 --- a/live-build/ubuntu-desktop-next/hooks/400-create-apt-get-warning.binary +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -set -ex - -echo "I: Creating warning to use snappy when apt-get is used" - -PREFIX=binary/boot/filesystem.dir - -mkdir -p $PREFIX/usr/local/bin -cat >$PREFIX/usr/local/bin/no-apt </\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t<\/policy>\n\t\t/g' /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf - -mkdir -p /etc/polkit-1/localauthority/50-local.d -cat > /etc/polkit-1/localauthority/50-local.d/org.freedesktop.NetworkManager.pkla << EOF -[indicator-network-service] -Identity=unix-group:sudo -Action=org.freedesktop.NetworkManager.* -ResultAny=yes -ResultInactive=no -ResultActive=yes -EOF diff --git a/live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary b/live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary deleted file mode 100644 index b32447de..00000000 --- a/live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -# -# move the kernel out into a new device tarfile with system/boot - -set -ex - -echo "I: Moving kernel into device tarball" - -HERE="$(pwd)" -TMPDIR="$(mktemp -d)" -mkdir -p $TMPDIR/system/ -mkdir -p $TMPDIR/assets/ - -# cp files, we can't simply use tar --transform as it changes the symlink target -( - cd binary/boot/filesystem.dir - - cp -ar --parent lib/modules/ $TMPDIR/system/ - cp -ar --parent lib/firmware/ $TMPDIR/system/ - - # new assets handling - if [ -f boot/vmlinu?-*.signed ]; then - kernel=boot/vmlinu?-*.signed - else - kernel=boot/vmlinu?-* - fi - - initrd=boot/initrd.img-* - - cp -ar $initrd $TMPDIR/assets/ - cp -ar $kernel $TMPDIR/assets/ - cp -ar boot/abi-* boot/System.map-* $TMPDIR/assets/ - - dtbs=$(find lib/firmware -type d -name 'device-tree' -print0) - if [ -n "$dtbs" ]; then - mv "$dtbs" $TMPDIR/assets/dtbs - fi - - # create hardware.yaml - # this assumes armh == u-boot - # and all others grub - # common bits - cat > $TMPDIR/hardware.yaml << EOF -kernel: assets/$(basename $kernel) -initrd: assets/$(basename $initrd) -partition-layout: system-AB -EOF - -# arch specific ones -if [ "$ARCH" = "armhf" ]; then - cat >> $TMPDIR/hardware.yaml << EOF -dtbs: assets/dtbs -bootloader: u-boot -EOF -else - cat >> $TMPDIR/hardware.yaml << EOF -bootloader: grub -EOF -fi -) - -# and tar it up -( - cd $TMPDIR - tar -c --sort=name -z -f $HERE/device.tar.gz system assets hardware.yaml -) - -rm -rf $TMPDIR - -# remove files from the root filesystem -(cd binary/boot/filesystem.dir - rm -f boot/vmlinu?-* - rm -f boot/initrd.img-* - rm -f boot/abi-* - rm -f boot/System.map-* - rm -f initrd.img - rm -f vmlinu? - rm -rf lib/modules - rm -rf lib/firmware -) diff --git a/live-build/ubuntu-desktop-next/hooks/99zz-check-uid-gid.chroot b/live-build/ubuntu-desktop-next/hooks/99zz-check-uid-gid.chroot deleted file mode 100755 index 4d7b807d..00000000 --- a/live-build/ubuntu-desktop-next/hooks/99zz-check-uid-gid.chroot +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -eu - -ERRCNT="" - -passwd_hash=$(set -- $(md5sum /etc/passwd) && echo $1) -shadow_hash=$(set -- $(cat /etc/shadow | sed "s/:.*:0:99999:/:0:99999:/g" | md5sum) && echo $1) -group_length=$(cat /etc/group | wc -l) -gshadow_length=$(cat /etc/gshadow | wc -l) - -passwd_orig_hash=$(set -- $(md5sum /etc/passwd.orig) && echo $1) -shadow_orig_hash=$(set -- $(cat /etc/shadow.orig | sed "s/:.*:0:99999:/:0:99999:/g" | md5sum) && echo $1) -group_orig_length=$(cat /etc/group.orig | wc -l) -gshadow_orig_length=$(cat /etc/gshadow.orig | wc -l) - -if [ "$passwd_hash" != "$passwd_orig_hash" ]; then - echo "/etc/passwd has changed during setup." >&2 - echo "The new /etc/passwd md5sum is: $passwd_hash" >&2 - diff -Nrup /etc/passwd.orig /etc/passwd >&2 || true - ERRCNT=1 -fi - -if [ "$shadow_hash" != "$shadow_orig_hash" ]; then - echo "/etc/shadow has changed during setup." >&2 - echo "The new /etc/shadow md5sum is: $shadow_hash" >&2 - diff -Nrup /etc/shadow.orig /etc/shadow >&2 || true - ERRCNT=1 -fi - -if [ "$group_length" != "$group_orig_length" ]; then - echo "/etc/group has changed during setup." >&2 - diff -Nrup /etc/group.orig /etc/group >&2 || true - ERRCNT=1 -fi - -if [ "$gshadow_length" != "$gshadow_orig_length" ]; then - echo "/etc/gshadow has changed during setup." >&2 - diff -Nrup /etc/gshadow.orig /etc/gshadow >&2 || true - ERRCNT=1 -fi - -if [ -n "$ERRCNT" ]; then - echo "There were changes to the password database," >&2 - echo "please adjust the values in the livecd-rootfs source in the file:" >&2 - echo "live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early" >&2 - echo >&2 - echo "Please check also if a maintainer script of the package" >&2 - echo "that added these entries perhaps created a home directory and," >&2 - echo "if needed, add code for creation of it to the above hook" >&2 - exit 1 -fi - -rm /etc/passwd.orig /etc/shadow.orig /etc/group.orig /etc/gshadow.orig diff --git a/live-build/ubuntu-desktop-next/includes.chroot/etc/hosts b/live-build/ubuntu-desktop-next/includes.chroot/etc/hosts deleted file mode 100644 index 81684340..00000000 --- a/live-build/ubuntu-desktop-next/includes.chroot/etc/hosts +++ /dev/null @@ -1,9 +0,0 @@ -127.0.0.1 localhost.localdomain localhost -::1 localhost6.localdomain6 localhost6 - -# The following lines are desirable for IPv6 capable hosts -::1 localhost ip6-localhost ip6-loopback -fe00::0 ip6-localnet -ff02::1 ip6-allnodes -ff02::2 ip6-allrouters -ff02::3 ip6-allhosts diff --git a/live-build/ubuntu-desktop-next/includes.chroot/usr/share/lightdm/lightdm.conf.d/90-desktop-next-autologin.conf b/live-build/ubuntu-desktop-next/includes.chroot/usr/share/lightdm/lightdm.conf.d/90-desktop-next-autologin.conf deleted file mode 100644 index 80387a35..00000000 --- a/live-build/ubuntu-desktop-next/includes.chroot/usr/share/lightdm/lightdm.conf.d/90-desktop-next-autologin.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Seat:*] -autologin-user=ubuntu diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount deleted file mode 120000 index 5aa5c72d..00000000 --- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount +++ /dev/null @@ -1 +0,0 @@ -../media-rack.lower.mount \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.mount deleted file mode 120000 index 35236752..00000000 --- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.mount +++ /dev/null @@ -1 +0,0 @@ -../media-rack.mount \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-region.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-region.mount deleted file mode 120000 index f4a748da..00000000 --- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-region.mount +++ /dev/null @@ -1 +0,0 @@ -../media-region.mount \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.lower.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.lower.mount deleted file mode 100644 index 8d1079f8..00000000 --- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.lower.mount +++ /dev/null @@ -1,5 +0,0 @@ -[Mount] -What=/cdrom/casper/maas/maas-rack.squashfs -Where=/media/rack.lower -Type=squashfs -Options=ro diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.mount deleted file mode 100644 index 90de99d5..00000000 --- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.mount +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -After=media-filesystem.mount -After=media-rack.lower.mount - -[Mount] -What=overlay -Where=/media/rack -Type=overlay -Options=lowerdir=/media/rack.lower:/media/filesystem diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.lower.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.lower.mount deleted file mode 100644 index ee220c0d..00000000 --- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.lower.mount +++ /dev/null @@ -1,5 +0,0 @@ -[Mount] -What=/cdrom/casper/maas/maas-region.squashfs -Where=/media/region.lower -Type=squashfs -Options=ro diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.mount deleted file mode 100644 index 7a52efff..00000000 --- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.mount +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -After=media-filesystem.mount -After=media-rack.lower.mount -After=media-region.lower.mount - -[Mount] -What=overlay -Where=/media/region -Type=overlay -Options=lowerdir=/media/region.lower:/media/rack.lower:/media/filesystem diff --git a/live-build/ubuntu-touch-custom b/live-build/ubuntu-touch-custom deleted file mode 120000 index ab44653c..00000000 --- a/live-build/ubuntu-touch-custom +++ /dev/null @@ -1 +0,0 @@ -ubuntu-touch/ \ No newline at end of file diff --git a/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early deleted file mode 100755 index 54a5a47b..00000000 --- a/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early +++ /dev/null @@ -1,315 +0,0 @@ -#!/bin/sh -eu - -ERRCNT="" - -# Known good post-debootstrap values -passwd_bootstrap="8c7663019ac545a6ba9a6021dd54b129" -shadow_bootstrap="021bea180cc9e71a34519d1212092954" -group_bootstrap="4a1be7f950a839f44708bb0919339ff9" -gshadow_bootstrap="e75f449f2327bc7e4c306a73e04d8815" - -# Current post-debootstrap values -passwd_hash=$(set -- $(md5sum /etc/passwd) && echo $1) -shadow_hash=$(set -- $(cat /etc/shadow | sed "s/:.*:0:99999:/:0:99999:/g" | md5sum) && echo $1) -group_hash=$(set -- $(md5sum /etc/group) && echo $1) -gshadow_hash=$(set -- $(md5sum /etc/gshadow) && echo $1) - -# /etc/passwd -if [ "$passwd_bootstrap" = "$passwd_hash" ]; then - cat > /etc/passwd <&2 - echo "The output below might help to resolve the issue" >&2 - cat /etc/passwd - echo "passwd md5sum: $passwd_hash" >&2 - ERRCNT=1 -fi - -# /etc/shadow -if [ "$shadow_bootstrap" = "$shadow_hash" ]; then - cat > /etc/shadow <&2 - echo "The output below might help to resolve the issue" >&2 - cat /etc/shadow - echo "shadow md5sum: $shadow_hash" >&2 - ERRCNT=1 -fi - -# /etc/group -if [ "$group_bootstrap" = "$group_hash" ]; then - cat > /etc/group <&2 - echo "The output below might help to resolve the issue" >&2 - cat /etc/group - echo "group md5sum: $group_hash" >&2 - ERRCNT=1 -fi - -# /etc/gshadow -if [ "$gshadow_bootstrap" = "$gshadow_hash" ]; then - cat > /etc/gshadow <&2 - echo "The output below might help to resolve the issue" >&2 - cat /etc/gshadow - echo "gshadow md5sum: $gshadow_hash" >&2 - ERRCNT=1 -fi - -if [ -n "$ERRCNT" ]; then - echo "There were changes to the password database," >&2 - echo "please adjust the values in the livecd-rootfs source in the file:" >&2 - echo "live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early" >&2 - echo >&2 - echo "Please check also if a maintainer script of the package" >&2 - echo "that added these entries perhaps created a home directory and," >&2 - echo "if needed, add code for creation of it to the above hook" >&2 - exit 1 -fi - -# Create some missing directories -mkdir -p /var/lib/lightdm -chown lightdm:lightdm /var/lib/lightdm -chmod 750 /var/lib/lightdm - -mkdir -p /var/lib/usermetrics -chown usermetrics:usermetrics /var/lib/usermetrics -chmod 750 /var/lib/usermetrics - -echo "adjusting ownership of /var/log" >&2 -chown root:syslog /var/log -ls -ln /var | grep log >&2 - -# Record the current state for later comparison -for file in /etc/passwd /etc/shadow /etc/group /etc/gshadow; do - rm -f ${file}- - cp ${file} ${file}.orig -done diff --git a/live-build/ubuntu-touch/hooks/01-setup_user.chroot b/live-build/ubuntu-touch/hooks/01-setup_user.chroot deleted file mode 100755 index 3232ef56..00000000 --- a/live-build/ubuntu-touch/hooks/01-setup_user.chroot +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -x - -USER=phablet -GECOS=Ubuntu -UGID=32011 - -echo "I: creating default user $USER" -adduser --gecos $GECOS --disabled-login $USER --uid $UGID - -echo "I: set user $USER password to blank" -passwd -d $USER - -adduser --gecos system --no-create-home --disabled-login --disabled-password system --uid 1000 -adduser --gecos radio --no-create-home --disabled-login --disabled-password radio --uid 1001 - -# Enable libnss-extrusers -sed -i 's/^group:.*compat/\0 extrausers/' /etc/nsswitch.conf -sed -i 's/^passwd:.*compat/\0 extrausers/' /etc/nsswitch.conf -sed -i 's/^shadow:.*compat/\0 extrausers/' /etc/nsswitch.conf - -# Move user from /etc to extrausers location -grep "^$USER" /etc/group >> /var/lib/extrausers/group -grep "^$USER" /etc/passwd >> /var/lib/extrausers/passwd -grep "^$USER" /etc/shadow >> /var/lib/extrausers/shadow -grep "^$USER" /etc/gshadow >> /var/lib/extrausers/gshadow -chmod 0644 /var/lib/extrausers/group -chmod 0644 /var/lib/extrausers/passwd -chmod 0640 /var/lib/extrausers/shadow -chmod 0640 /var/lib/extrausers/gshadow -chown root:shadow /var/lib/extrausers/shadow -chown root:shadow /var/lib/extrausers/gshadow -sed -i "/^$USER/d" /etc/group -sed -i "/^$USER/d" /etc/passwd -sed -i "/^$USER/d" /etc/shadow -sed -i "/^$USER/d" /etc/gshadow -touch /var/lib/extrausers/subuid -touch /var/lib/extrausers/subgid - -# Prevent the system user from being presented in the greeter by bumping MIN_UID -sed -i 's/^\(UID_MIN\s\+\).*/\11002/g' /etc/login.defs - -mkdir -p /home/$USER/Music -mkdir -p /home/$USER/Pictures -mkdir -p /home/$USER/Videos -mkdir -p /home/$USER/Downloads -mkdir -p /home/$USER/Documents -chown -R $UGID:$UGID /home/$USER diff --git a/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot b/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot deleted file mode 100755 index 73674aa0..00000000 --- a/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh -x - -USER=phablet - -DEFGROUPS="tty,sudo,adm,dialout,cdrom,plugdev,audio,dip,video,gps,radio,bluetooth,android_net,android_net2,android_net3,android_graphics,android_input,sdcard_rw,android_media,android_nvram,android_cache" - -/bin/egrep -i "^audio:" /etc/group -if [ $? -eq 0 ]; then - # Needed to change group id as audio is already created by ubuntu - echo "User audio exists in /etc/group, changing gid to be android compatible" - groupmod -g 1005 audio -else - echo "User audio does not exists in /etc/group must create" - groupadd -g 1005 audio -fi -/bin/egrep -i "^gps:" /etc/group -if [ $? -eq 0 ]; then - echo "User gps exists in /etc/group" -else - echo "User gps does not exist in /etc/group -- must create" - groupadd -g 1021 gps -fi -/bin/egrep -i "^radio:" /etc/group -if [ $? -eq 0 ]; then - echo "User radio exists in /etc/group" -else - echo "User radio does not exist in /etc/group -- must create" - groupadd -g 1001 radio -fi -/bin/egrep -i "^bluetooth:" /etc/group -if [ $? -eq 0 ]; then - echo "User bluetooth exists in /etc/group changing ID to 1002" - groupmod -g 1002 bluetooth -else - echo "User bluetooth does not exist in /etc/group -- must create" - groupadd -g 1002 bluetooth -fi -/bin/egrep -i "^android_net:" /etc/group -if [ $? -eq 0 ]; then - echo "User android_net exists in /etc/group" -else - echo "User android_net does not exist in /etc/group -- must create" - groupadd -g 3003 android_net -fi -/bin/egrep -i "^android_net2:" /etc/group -if [ $? -eq 0 ]; then - echo "User android_net2 exists in /etc/group" -else - echo "User android_net2 does not exist in /etc group -- must create" - groupadd -g 3004 android_net2 -fi -/bin/egrep -i "^android_net3:" /etc/group -if [ $? -eq 0 ]; then - echo "User android_net3 exists in /etc/group" -else - echo "User android_net3 does not exist in /etc group -- must create" - groupadd -g 3002 android_net3 -fi -/bin/egrep -i "^android_graphics:" /etc/group -if [ $? -eq 0 ]; then - echo "User android_graphics exists in /etc/group" -else - echo "User android_graphics does not exist in /etc group -- must create" - groupadd -g 1003 android_graphics -fi -/bin/egrep -i "^android_input:" /etc/group -if [ $? -eq 0 ]; then - echo "User android_input exists in /etc/group" -else - echo "User android_input does not exist in /etc group -- must create" - groupadd -g 1004 android_input -fi -/bin/egrep -i "^sdcard_rw:" /etc/group -if [ $? -eq 0 ]; then - echo "User sdcard_rw exists in /etc/group" -else - echo "User sdcard_rw does not exist in /etc group -- must create" - groupadd -g 1015 sdcard_rw -fi -/bin/egrep -i "^android_media:" /etc/group -if [ $? -eq 0 ]; then - echo "User android_media exists in /etc/group" -else - echo "User android_media does not exist in /etc group -- must create" - groupadd -g 1013 android_media -fi -/bin/egrep -i "^android_nvram:" /etc/group -if [ $? -eq 0 ]; then - echo "User android_nvram exists in /etc/group" -else - echo "User android_nvram does not exist in /etc group -- must create" - groupadd -g 9997 android_nvram -fi -/bin/egrep -i "^android_cache:" /etc/group -if [ $? -eq 0 ]; then - echo "User android_cache exists in /etc/group" -else - echo "User android_cache does not exist in /etc group -- must create" - groupadd -g 2001 android_cache -fi - -echo "I: add $USER to ($DEFGROUPS) groups" -usermod -a -G ${DEFGROUPS} ${USER} - diff --git a/live-build/ubuntu-touch/hooks/03-etc-writable.chroot b/live-build/ubuntu-touch/hooks/03-etc-writable.chroot deleted file mode 100755 index 22626c24..00000000 --- a/live-build/ubuntu-touch/hooks/03-etc-writable.chroot +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -set -e -set -x - -mkdir -p /etc/writable -touch /etc/writable/machine-info - -for f in timezone localtime machine-info hostname whoopsie; do - if [ -e /etc/$f ]; then - echo "I: Moving /etc/$f to /etc/writable/" - mv /etc/$f /etc/writable/$f - fi - echo "I: Linking /etc/$f to /etc/writable/" - ln -s writable/$f /etc/$f -done diff --git a/live-build/ubuntu-touch/hooks/20-extra-files.chroot b/live-build/ubuntu-touch/hooks/20-extra-files.chroot deleted file mode 100755 index f4a35f28..00000000 --- a/live-build/ubuntu-touch/hooks/20-extra-files.chroot +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -set -e - -echo "creating mtab and modules dir" >&2 -ln -sf /proc/mounts /etc/mtab -mkdir -p /lib/modules -mkdir -p /lib/firmware -mkdir -p /userdata diff --git a/live-build/ubuntu-touch/hooks/45-add-sudo-group-nm.chroot b/live-build/ubuntu-touch/hooks/45-add-sudo-group-nm.chroot deleted file mode 100755 index 66d45396..00000000 --- a/live-build/ubuntu-touch/hooks/45-add-sudo-group-nm.chroot +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -echo "Adding admin group policy to NM system service" - -sed -i 's//\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t<\/policy>\n\t\t/g' /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf - -mkdir -p /etc/polkit-1/localauthority/50-local.d -cat > /etc/polkit-1/localauthority/50-local.d/org.freedesktop.NetworkManager.pkla << EOF -[indicator-network-service] -Identity=unix-group:sudo -Action=org.freedesktop.NetworkManager.* -ResultAny=yes -ResultInactive=no -ResultActive=yes -EOF diff --git a/live-build/ubuntu-touch/hooks/48-setup-env.chroot b/live-build/ubuntu-touch/hooks/48-setup-env.chroot deleted file mode 100755 index 74b43c21..00000000 --- a/live-build/ubuntu-touch/hooks/48-setup-env.chroot +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -echo "I: setting up initial environment for Touch..." - -echo "HOSTNAME=android -TERM=linux -ANDROID_CACHE=/cache -LOOP_MOUNTPOINT=/mnt/obb -ASEC_MOUNTPOINT=/mnt/asec -ANDROID_PROPERTY_WORKSPACE=8,49152 -ANDROID_ASSETS=/system/app -ANDROID_BOOTLOGO=1 -LD_LIBRARY_PATH=/vendor/lib:/system/lib -PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -ANDROID_DATA=/data -QT_SELECT=qt5 -SHLVL=1 -MKSH=/system/bin/sh -ANDROID_ROOT=/system -EXTERNAL_STORAGE=/mnt/sdcard -LANG=en_US.UTF-8 -LANGUAGE=en_US:en -FLASH_KERNEL_SKIP=true -QT_IM_MODULE=maliitphablet" > /etc/environment diff --git a/live-build/ubuntu-touch/hooks/50-upower-poweroff-percentages.chroot b/live-build/ubuntu-touch/hooks/50-upower-poweroff-percentages.chroot deleted file mode 100755 index e39a91eb..00000000 --- a/live-build/ubuntu-touch/hooks/50-upower-poweroff-percentages.chroot +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/sh - -set -e - -echo "Updating upower configuration..." - -sed -i 's/^UsePercentageForPolicy=.*/UsePercentageForPolicy=true/' /etc/UPower/UPower.conf -sed -i 's/^CriticalPowerAction=.*/CriticalPowerAction=PowerOff/' /etc/UPower/UPower.conf - - diff --git a/live-build/ubuntu-touch/hooks/60-install-click.binary b/live-build/ubuntu-touch/hooks/60-install-click.binary deleted file mode 100755 index 25b1d71a..00000000 --- a/live-build/ubuntu-touch/hooks/60-install-click.binary +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -set -e - -echo "Splitting out custom tarball" - -rm -f binary/boot/custom.dir -mkdir -p binary/boot/custom.dir/system -mv binary/boot/filesystem.dir/custom binary/boot/custom.dir/system/custom diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot deleted file mode 100755 index cbebda2b..00000000 --- a/live-build/ubuntu-touch/hooks/60-install-click.chroot +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh - -set -e - -echo "Setting up click packages" - -CLICKARCH=$(dpkg --print-architecture) - -click_uri=http://archive-team.internal/click_packages -if [ "$CLICKARCH" = "arm64" ]; then - # FIXME: this is temporary. Since right now we can't have arm64 clicks in the store - # (before implementing fat-packages), we need to fetch the arm64 click list from a - # different place - click_list=$click_uri/click_list.arm64 - click_install_flags="--allow-unauthenticated" -else - click_list=$click_uri/click_list - click_install_flags="" -fi -click_db=/usr/share/click/preinstalled -click_db_custom=/custom/click - -mkdir -p -m 755 "$click_db" -chown clickpkg:clickpkg "$click_db" - -# some of these get installed to /custom/click -mkdir -p -m 755 "$click_db_custom" -chown clickpkg:clickpkg "$click_db_custom" - -tmpdir="$(mktemp -d)" -cleanup () { rm -rf "$tmpdir"; } -trap cleanup EXIT - -wget --no-verbose -O "$tmpdir/click_list" "$click_list" -for package in $(cat "$tmpdir/click_list") -do - if echo $package | egrep -q "_$CLICKARCH.click|_all.click|_unknown.click|_multi.click"; then - echo "Setting up $package" - wget --no-verbose -O "$tmpdir/$package" "$click_uri/$package" - # FIXME: first attempt, a hard-coded list of the packages that go to - # the custom tarball - case $package in - com.ubuntu.developer.webapps.webapp-amazon_*|\ - com.ubuntu.developer.webapps.webapp-ebay_*|\ - com.ubuntu.developer.webapps.webapp-facebook_*|\ - com.ubuntu.developer.webapps.webapp-gmail_*|\ - com.ubuntu.developer.webapps.webapp-twitter_*|\ - com.ubuntu.scopes.youtube_*|\ - com.ubuntu.dropping-letters_*|\ - com.ubuntu.filemanager_*|\ - com.ubuntu.reminders_*|\ - com.ubuntu.shorts_*|\ - com.ubuntu.sudoku_*|\ - com.ubuntu.terminal_*|\ - com.ubuntu.calendar_*|\ - navigator.costales_*|\ - dekko.dekkoproject_*) - roots="$click_db_custom" - ;; - *) - roots="$click_db" - ;; - esac - for root in $roots; do - if [ "$root" = "$click_db_custom" ]; then - # FIXME: there is no good way to stop click from - # deduplicating things when installing the same package in - # multiple databases; the best we can do is to temporarily - # pretend that the core database does not exist - mv /etc/click/databases/10_core.conf \ - /etc/click/databases/10_core.conf.tmp - fi - click install --force-missing-framework --root="$root" --all-users $click_install_flags \ - "$tmpdir/$package" - if [ "$root" = "$click_db_custom" ]; then - mv /etc/click/databases/10_core.conf.tmp \ - /etc/click/databases/10_core.conf - fi - done - fi -done diff --git a/live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot b/live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot deleted file mode 100755 index 296fec0f..00000000 --- a/live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -# make sure the phablet user is in the autopilot group -# (the user is not available when the package postinst -# adds all users of the sudo group to the autopilot one -# so we re-run the package configuration now - -echo "making sure phablet user is in the autopilot group" - -for pkg in python-autopilot python3-autopilot; do - if dpkg-query -W -f '${Status}\n' "$pkg" 2>/dev/null | \ - grep -q ' installed$'; then - dpkg-reconfigure "$pkg" - break - fi -done diff --git a/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot b/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot deleted file mode 100755 index 185a68b6..00000000 --- a/live-build/ubuntu-touch/hooks/80-enable-libhybris.chroot +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -echo "I: making libhybris the default alternatives for @DEB_HOST_MULTIARCH@_egl_conf" -update-alternatives --set @DEB_HOST_MULTIARCH@_egl_conf /usr/lib/@DEB_HOST_MULTIARCH@/libhybris-egl/ld.so.conf - -# ldconfig needs to be run immediately as we're changing /etc/ld.so.conf.d/ with alternatives. -LDCONFIG_NOTRIGGER=y ldconfig diff --git a/live-build/ubuntu-touch/hooks/90-precompile-apparmor-policies.chroot b/live-build/ubuntu-touch/hooks/90-precompile-apparmor-policies.chroot deleted file mode 100755 index de9cbbf4..00000000 --- a/live-build/ubuntu-touch/hooks/90-precompile-apparmor-policies.chroot +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh - -FEATURES=/var/cache/apparmor/.features - -echo "I: precompiling click apparmor policies" -/sbin/apparmor_parser -v -M ${FEATURES} -Q --write-cache --cache-loc=/var/cache/apparmor/ `find /var/lib/apparmor/profiles/ -maxdepth 1 -type f -not -path '*/\.*'` - -echo "I: precompiling deb apparmor policies" -/sbin/apparmor_parser -v -M ${FEATURES} -Q --write-cache --cache-loc=/etc/apparmor.d/cache/ `find /etc/apparmor.d/ -maxdepth 1 -type f -not -path '*/\.*'` - -echo "I: precompiling custom click apparmor policies" -mkdir -p /custom/cache/apparmor -/sbin/apparmor_parser -v -M ${FEATURES} -Q --write-cache --cache-loc=/custom/cache/apparmor/ `find /var/lib/apparmor/profiles/ -maxdepth 1 -type f -not -path '*/\.*'` - -#get the apparmor manifests and profiles -mkdir -p /custom/lib/apparmor/clicks -mkdir -p /custom/lib/apparmor/profiles - -for manifest in /var/lib/apparmor/clicks/*; do - # FIXME: if this code survives for very long, it should probably be - # rewritten using click's Python bindings - pkgdir="$(click pkgdir "$manifest")" - manifest_real="$(readlink -f "$manifest")" - manifest_tail="${manifest_real#$pkgdir}" - # Does this package exist in the custom tarball? If so, move its - # profiles there (if it only exists in custom) or copy them (if it - # also exists in core). - version="${pkgdir##*/}" - pkgdir_noversion="${pkgdir%/*}" - name="${pkgdir_noversion##*/}" - profile="$(basename "$manifest" .json)" - if [ -d "/custom/click/$name/$version" ]; then - # Clone into custom. - ln -nsf "/custom/click/$name/$version$manifest_tail" "/custom/lib/apparmor/clicks/${manifest##*/}" - cp -a "/var/lib/apparmor/profiles/click_$profile" /custom/lib/apparmor/profiles/ - if [ -d "/usr/share/click/preinstalled/$name/$version" ]; then - # Ensure that the version in the rootfs points to - # the core database. - ln -nsf "/usr/share/click/preinstalled/$name/$version$manifest_tail" "$manifest" - else - # Remove from the rootfs. - rm -f "$manifest" - rm -f "/var/lib/apparmor/profiles/click_$profile" - rm -f "/var/cache/apparmor/click_$profile" - fi - else - # Remove from custom. - rm -f "/custom/cache/apparmor/click_$profile" - fi -done - -ls -l /custom/cache/apparmor/ -echo "I: touching cache files to sanitize possible timestamp issues" -touch /custom/cache/apparmor/* -ls -l /custom/cache/apparmor/ diff --git a/live-build/ubuntu-touch/hooks/99-remove-documentation.chroot b/live-build/ubuntu-touch/hooks/99-remove-documentation.chroot deleted file mode 100755 index 593d8a87..00000000 --- a/live-build/ubuntu-touch/hooks/99-remove-documentation.chroot +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# remove-documentation: Remove unnecessary documentation to reduce disk usage -# -# Author: Alex Chiang -# Date : November 9, 2010 - -echo "Removing documentation..." -find /usr/share/doc -depth -type f ! -name copyright|xargs rm || true -find /usr/share/doc -empty|xargs rmdir || true -rm -rf /usr/share/man /usr/share/groff /usr/share/info /usr/share/lintian /usr/share/linda /var/cache/man diff --git a/live-build/ubuntu-touch/hooks/99-remove-lists.binary b/live-build/ubuntu-touch/hooks/99-remove-lists.binary deleted file mode 100755 index 37f3295f..00000000 --- a/live-build/ubuntu-touch/hooks/99-remove-lists.binary +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# remove-lists: Remove all apt lists for space as our apport does not need them -# -# Author: Łukasz 'sil2100' Zemczak -# Date : September 22, 2015 - -echo "Removing /var/lib/apt/lists/* from the binary" -find binary/boot/filesystem.dir/var/lib/apt/lists/ -type f | xargs rm -f \ No newline at end of file diff --git a/live-build/ubuntu-touch/hooks/99zz-check-uid-gid.chroot b/live-build/ubuntu-touch/hooks/99zz-check-uid-gid.chroot deleted file mode 100755 index 0d43bbd3..00000000 --- a/live-build/ubuntu-touch/hooks/99zz-check-uid-gid.chroot +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -eu - -ERRCNT="" - -passwd_hash=$(set -- $(md5sum /etc/passwd) && echo $1) -shadow_hash=$(set -- $(cat /etc/shadow | sed "s/:.*:0:99999:/:0:99999:/g" | md5sum) && echo $1) -group_length=$(cat /etc/group | wc -l) -gshadow_length=$(cat /etc/gshadow | wc -l) - -passwd_orig_hash=$(set -- $(md5sum /etc/passwd.orig) && echo $1) -shadow_orig_hash=$(set -- $(cat /etc/shadow.orig | sed "s/:.*:0:99999:/:0:99999:/g" | md5sum) && echo $1) -group_orig_length=$(cat /etc/group.orig | wc -l) -gshadow_orig_length=$(cat /etc/gshadow.orig | wc -l) - -if [ "$passwd_hash" != "$passwd_orig_hash" ]; then - echo "/etc/passwd has changed during setup." >&2 - echo "The new /etc/passwd md5sum is: $passwd_hash" >&2 - diff -Nrup /etc/passwd.orig /etc/passwd >&2 || true - ERRCNT=1 -fi - -if [ "$shadow_hash" != "$shadow_orig_hash" ]; then - echo "/etc/shadow has changed during setup." >&2 - echo "The new /etc/shadow md5sum is: $shadow_hash" >&2 - diff -Nrup /etc/shadow.orig /etc/shadow >&2 || true - ERRCNT=1 -fi - -if [ "$group_length" != "$group_orig_length" ]; then - echo "/etc/group has changed during setup." >&2 - diff -Nrup /etc/group.orig /etc/group >&2 || true - ERRCNT=1 -fi - -if [ "$gshadow_length" != "$gshadow_orig_length" ]; then - echo "/etc/gshadow has changed during setup." >&2 - diff -Nrup /etc/gshadow.orig /etc/gshadow >&2 || true - ERRCNT=1 -fi - -if [ -n "$ERRCNT" ]; then - echo "There were changes to the password database," >&2 - echo "please adjust the values in the livecd-rootfs source in the file:" >&2 - echo "live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early" >&2 - echo >&2 - echo "Please check also if a maintainer script of the package" >&2 - echo "that added these entries perhaps created a home directory and," >&2 - echo "if needed, add code for creation of it to the above hook" >&2 - exit 1 -fi - -echo "ownership of /var/log after build:" >&2 -ls -ln /var| grep log >&2 - -rm /etc/passwd.orig /etc/shadow.orig /etc/group.orig /etc/gshadow.orig diff --git a/live-build/ubuntu-touch/includes.chroot/etc/default/locale b/live-build/ubuntu-touch/includes.chroot/etc/default/locale deleted file mode 100644 index dd6eee3a..00000000 --- a/live-build/ubuntu-touch/includes.chroot/etc/default/locale +++ /dev/null @@ -1 +0,0 @@ -LANG="en_US.UTF-8" diff --git a/live-build/ubuntu-touch/includes.chroot/etc/hostname b/live-build/ubuntu-touch/includes.chroot/etc/hostname deleted file mode 100644 index e3cc2675..00000000 --- a/live-build/ubuntu-touch/includes.chroot/etc/hostname +++ /dev/null @@ -1 +0,0 @@ -ubuntu-phablet diff --git a/live-build/ubuntu-touch/includes.chroot/etc/hosts b/live-build/ubuntu-touch/includes.chroot/etc/hosts deleted file mode 100644 index d4563020..00000000 --- a/live-build/ubuntu-touch/includes.chroot/etc/hosts +++ /dev/null @@ -1,10 +0,0 @@ -127.0.0.1 localhost.localdomain localhost -::1 ubuntu-phablet localhost6.localdomain6 localhost6 -127.0.1.1 ubuntu-phablet - -# The following lines are desirable for IPv6 capable hosts -::1 localhost ip6-localhost ip6-loopback -fe00::0 ip6-localnet -ff02::1 ip6-allnodes -ff02::2 ip6-allrouters -ff02::3 ip6-allhosts diff --git a/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf.d/90-phablet.conf b/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf.d/90-phablet.conf deleted file mode 100644 index e6f8e34e..00000000 --- a/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf.d/90-phablet.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Seat:*] -autologin-user=phablet -greeter-allow-guest=false diff --git a/live-build/ubuntu-touch/includes.chroot/var/cache/apparmor/.features b/live-build/ubuntu-touch/includes.chroot/var/cache/apparmor/.features deleted file mode 100644 index 9d7e6af1..00000000 --- a/live-build/ubuntu-touch/includes.chroot/var/cache/apparmor/.features +++ /dev/null @@ -1,52 +0,0 @@ -dbus {mask {acquire send receive -} -} -signal {mask {hup int quit ill trap abrt bus fpe kill usr1 segv usr2 pipe alrm term stkflt chld cont stop stp ttin ttou urg xcpu xfsz vtalrm prof winch io pwr sys emt lost -} -} -ptrace {mask {read trace -} -} -caps {mask {chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_admin sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_write audit_control setfcap mac_override mac_admin syslog wake_alarm epollwakeup -} -} -rlimit {mask {cpu fsize data stack core rss nproc nofile memlock as locks sigpending msgqueue nice rtprio rttime -} -} -capability {0xffffff -} -namespaces {pivot_root {yes -} -profile {yes -} -} -mount {mask {mount umount -} -} -network {af_unix {yes -} -af_mask {unspec unix inet ax25 ipx appletalk netrom bridge atmpvc x25 inet6 rose netbeui security key netlink packet ash econet atmsvc rds sna irda pppox wanpipe llc can tipc bluetooth iucv rxrpc isdn phonet ieee802154 caif alg nfc -} -} -file {mask {create read write exec append mmap_exec link lock -} -} -domain {change_profile {yes -} -change_onexec {yes -} -change_hatv {yes -} -change_hat {yes -} -} -policy {set_load {yes -} -versions {v7 {yes -} -v6 {yes -} -v5 {yes -} -} -}