[meego-commits] 23511: Changes to Trunk:Testing/installer-shell

[itachi]

Hi,
I have made the following changes to installer-shell in project Trunk:Testing. Please review and accept ASAP.

Thank You,
itachi

[This message was auto-generated]

---

Request #23511:

  submit:   home:itachi:branches:Trunk:Testing/installer-shell(r2)(cleanup) -> Trunk:Testing/installer-shell


Message:
    * Tue Aug 02 2011 - Chengwei Yang <chengwei.yang at intel.com> - 0.6
- skip copy tmpfs mounted by systemd. (BMC#22287)

State:   new          2011-08-02T18:49:51 itachi
Comment: None



changes files:
--------------
--- installer-shell.changes
+++ installer-shell.changes
@@ -0,0 +1,3 @@
+* Tue Aug 02 2011 - Chengwei Yang <chengwei.yang at intel.com> - 0.6
+- skip copy tmpfs mounted by systemd. (BMC#22287)
+

new:
----
  skip-copy-tmpfs.patch

spec files:
-----------
--- installer-shell.spec
+++ installer-shell.spec
@@ -26,6 +26,7 @@
 Patch7:     fix-package-clean.patch
 Patch8:     delete-vfs-mount-entry.patch
 Patch9:     skip-btrfs-fsck.patch
+Patch10:     skip-copy-tmpfs.patch
 Requires:   parted
 Requires:   rsync
 Requires:   system-logos
@@ -64,6 +65,8 @@
 %patch8 -p1
 # skip-btrfs-fsck.patch
 %patch9 -p1
+# skip-copy-tmpfs.patch
+%patch10 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ installer-shell.yaml
--- installer-shell.yaml
+++ installer-shell.yaml
@@ -19,6 +19,7 @@
     - fix-package-clean.patch
     - delete-vfs-mount-entry.patch
     - skip-btrfs-fsck.patch
+    - skip-copy-tmpfs.patch
 Description: |
     A shell-script based installer which implements the installation process
 Requires:

++++++ skip-copy-tmpfs.patch (new)
--- skip-copy-tmpfs.patch
+++ skip-copy-tmpfs.patch
+diff -Naur a/installer-shell b/installer-shell
+--- a/installer-shell	2011-08-02 17:57:14.841548902 +0800
++++ b/installer-shell	2011-08-02 18:00:56.733528758 +0800
+@@ -801,7 +801,8 @@
+ }
+ 
+ copy_fs () {
+-	local RSYNC_CMD="rsync -aq --exclude=/dev/* --exclude=/proc/* --exclude=/sys/* --exclude=/media/* --exclude=/tmp/*"
++	local RSYNC_CMD="rsync -aq --exclude=/dev/* --exclude=/proc/* --exclude=/sys/* --exclude=/media/* \
++	--exclude=/tmp/* --exclude=/run/* --exclude=/var/run/*"
+ 	dbglg "Set timezone before copying: /usr/sbin/hwclock --hctosys -u"
+ 	/usr/sbin/hwclock --hctosys -u >> $LOGFILE 2>&1
+ 	dbglg "Mount partitions"