ugr-ebuild

Merge lp:~soaringsky/ugr-ebuild/current into lp:ugr-ebuild

  1. current
  2. Merge into natty-dev
Proposed by JC Hulce
Status: Merged
Approved by: JC Hulce
Approved revision: 185
Merged at revision: 185
Proposed branch: lp:~soaringsky/ugr-ebuild/current
Merge into: lp:ugr-ebuild
Diff against target: 51 lines (+8/-8)
2 files modified
build.sh (+6/-6)
conf.sh (+2/-2)
To merge this branch: bzr merge lp:~soaringsky/ugr-ebuild/current
Reviewer Review Type Date Requested Status
Team Pr0xy Tarmac Merge Bot Approve
JC Hulce (community) diffconfirm Approve
Review via email: mp+65284@code.launchpad.net

Commit message

Merge from upstream, fix fixes 797590

Description of the change

Merge with upstream, fixes #797590

To post a comment you must log in.
Revision history for this message
JC Hulce (soaringsky) wrote :

Confirmed diff

review: Approve (diffconfirm)
Revision history for this message
Team Pr0xy Tarmac Merge Bot (pr0xybot) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build.sh'
2--- build.sh 2011-06-17 16:56:50 +0000
3+++ build.sh 2011-06-21 01:18:29 +0000
4@@ -19,7 +19,7 @@
5 chmod +x conf.sh
6
7 # Variables
8-VERSION="0.2"
9+VERSION="0.4"
10 BASE_DISTRO="Ubuntu 11.04"
11 IMAGE_NAME="UGR-dev"
12
13@@ -93,11 +93,11 @@
14 uck-remaster-chroot-rootfs "$REMASTER_DIR" /bin/bash;
15 fi
16
17-# Change casper.conf
18-sed -i 's/USERNAME="ubuntu"/USERNAME="me"/' "$REMASTER_DIR"/remaster-initrd/etc/casper.conf
19-sed -i 's/USERFULLNAME="Live session user"/USERFULLNAME="me"/' "$REMASTER_DIR"/remaster-initrd/etc/casper.conf
20-sed -i 's/HOST="ubuntu"/HOST="ugr"/' "$REMASTER_DIR"/remaster-initrd/etc/casper.conf
21-sed -i 's/BUILD_SYSTEM="Ubuntu"/BUILD_SYSTEM="UGR"/' "$REMASTER_DIR"/remaster-initrd/etc/casper.conf
22+# Change casper.conf - causes bug 797590
23+# sed -i 's/USERNAME="ubuntu"/USERNAME="me"/' "$REMASTER_DIR"/remaster-initrd/etc/casper.conf
24+# sed -i 's/USERFULLNAME="Live session user"/USERFULLNAME="me"/' "$REMASTER_DIR"/remaster-initrd/etc/casper.conf
25+# sed -i 's/HOST="ubuntu"/HOST="elementary"/' "$REMASTER_DIR"/remaster-initrd/etc/casper.conf
26+# sed -i 's/BUILD_SYSTEM="Ubuntu"/BUILD_SYSTEM="elementary"/' "$REMASTER_DIR"/remaster-initrd/etc/casper.conf
27
28 # Rebranding ISO contents
29 cp -t "$REMASTER_DIR"/remaster-iso/isolinux "$DATADIR"/resources/access.pcx "$DATADIR"/resources/blank.pcx "$DATADIR"/resources/splash.pcx "$DATADIR"/resources/gfxboot.cfg
30
31=== modified file 'conf.sh'
32--- conf.sh 2011-06-14 07:38:36 +0000
33+++ conf.sh 2011-06-21 01:18:29 +0000
34@@ -135,7 +135,7 @@
35 pwd
36
37 # Remove Unity:
38-apt-get remove -f -y --purge unity* unity-2d*
39+apt-get remove -f -y --purge unity* unity-2d* libunity*
40
41 # Remove Branding stuff:
42 apt-get remove -f -y --purge branding-ubuntu example-content plymouth-theme-ubuntu-logo plymouth-theme-ubuntu-text ubuntu-wallpapers ubiquity-slideshow-ubuntu #gnome-themes-ubuntu light-themes plymouth-label ubuntu-artwork ubuntu-mono ubuntu-sounds
43@@ -255,7 +255,7 @@
44 $setconf bool /apps/nautilus/preferences/show_desktop FALSE
45
46 # Fix userrights of "me"
47-sed -i 's/"Ubuntu"/"UGR"/' /usr/share/initramfs-tools/scripts/casper-bottom/10adduser
48+sed -i 's/"Ubuntu"/"elementary"/' /usr/share/initramfs-tools/scripts/casper-bottom/10adduser
49
50 # Plymouth
51 echo FRAMEBUFFER=y >>/etc/initramfs-tools/conf.d/splash

Subscribers

People subscribed via source and target branches

to all changes: