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

[JC Hulce]

Cleanup of extra unneeded mods that might be causing boot issues

Cleanup of extra unneeded mods that might be causing boot issues

[JC Hulce (soaringsky)]

review: Approve (diffconfirm)

=== modified file 'conf.sh'
--- conf.sh	2011-06-22 18:51:28 +0000
+++ conf.sh	2011-06-23 00:55:59 +0000
@@ -172,7 +172,7 @@
 apt-get autoremove -f -y
 
 # Install apps for UGR deskop 
-apt-get install -f -y --allow-unauthenticated ugr-desktop-g3 ugr-wallpapers cantarell-fonts gnome-shell ubiquity ubiquity-frontend-gtk
+apt-get install -f -y --allow-unauthenticated ugr-desktop ugr-wallpapers cantarell-fonts gnome-shell ubiquity ubiquity-frontend-gtk
 
 # Install deborphan - we'll need it later for cleanup
 apt-get install -f -y --no-install-recommends --allow-unauthenticated deborphan
@@ -239,6 +239,10 @@
 # Bye-bye unity, don't come back
 apt-get remove -f -y --purge gnome-accessibility-themes unity unity-common unity-2d unity-asset-pool unity-place-applications unity-place-files plymouth-theme-ubuntu-logo
 
+update-initramfs
+update-grub2
+update-grub
+
 # Everything below here is from elementary, and may or may not be needed for us.  
 # Please try and find out what it does and if it is needed.  
 
@@ -258,10 +262,10 @@
 $setconf bool /apps/nautilus/preferences/show_desktop FALSE
 
 # Fix userrights of "me"
-sed -i 's/"Ubuntu"/"elementary"/' /usr/share/initramfs-tools/scripts/casper-bottom/10adduser
+# sed -i 's/"Ubuntu"/"elementary"/' /usr/share/initramfs-tools/scripts/casper-bottom/10adduser
 
 # Plymouth
-echo FRAMEBUFFER=y >>/etc/initramfs-tools/conf.d/splash
+# echo FRAMEBUFFER=y >>/etc/initramfs-tools/conf.d/splash
 
 # Ubuntu Software-Center
 # Do we need this?  Things should be fine the way they are, and this is elementary specific
@@ -271,7 +275,7 @@
 # Ubiquity
 cp -t /usr/share/ubiquity/ /tmp/ubuntu_installed.png /tmp/cd_in_tray.png
 cp -t /usr/share/ubiquity/pixmaps /tmp/ubuntu_installed.png /tmp/cd_in_tray.png
-cp -f /tmp/ubi-language.py /usr/lib/ubiquity/plugins/
+# cp -f /tmp/ubi-language.py /usr/lib/ubiquity/plugins/
 
 # Change gdm settings to elementary style
 # sed -i 's/Ubuntu /elementary /' /usr/share/xsessions/gnome.desktop /usr/share/xsessions/gnome-failsafe.desktop /etc/gdm/failsafeXinit
@@ -308,7 +312,7 @@
 # $setconf string /desktop/gnome/interface/toolbar_style icons
 
 # Metacity
-$setconf int /apps/metacity/general/num_workspaces 2
+# $setconf int /apps/metacity/general/num_workspaces 2
 # $setconf bool /apps/metacity/general/compositing_manager TRUE
 # $setconf string /apps/metacity/general/button_layout close,minimize,maximize:
 
@@ -333,12 +337,12 @@
 cp -f /tmp/10-help-text /etc/update-motd.d/10-help-text
 
 # GRUB2 awesomeness
-patch -f -c </tmp/10_linux.patch
-if [ "$?" != 0 ]; then
-	echo -e "\nWARNING:\nFailed to patch the GRUB entry, it must have been changed by upstream.\nPlease report a bug at https://bugs.launchpad.net/ugr-ebuild/+filebug\nAttempting to continue anyway." > /dev/stderr
-	mv -f --no-target-directory 10_linux.orig /etc/grub.d/10_linux
-	rm -f 10_linux.rej
-fi
+# patch -f -c </tmp/10_linux.patch
+# if [ "$?" != 0 ]; then
+# 	echo -e "\nWARNING:\nFailed to patch the GRUB entry, it must have been changed by upstream.\nPlease report a bug at https://bugs.launchpad.net/ugr-ebuild/+filebug\nAttempting to continue anyway." > /dev/stderr
+# 	mv -f --no-target-directory 10_linux.orig /etc/grub.d/10_linux
+# 	rm -f 10_linux.rej
+# fi
 
 # Remove orphaned packages
 while [ -n "$(deborphan)" ]; do