From e6cc7b84d8d9e5c8409f7be67784891073b61b96 Mon Sep 17 00:00:00 2001 From: Rafal Wojtczuk Date: Sun, 10 Apr 2011 15:18:17 +0200 Subject: [PATCH 1/7] qubes_setupdvm: preserve mtime of the default savefile copy in shm Otherwise, if the savefile is stale, we would use it instead of recreating. --- dom0/init.d/qubes_setupdvm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom0/init.d/qubes_setupdvm b/dom0/init.d/qubes_setupdvm index 5ff768f2..26390536 100755 --- a/dom0/init.d/qubes_setupdvm +++ b/dom0/init.d/qubes_setupdvm @@ -30,7 +30,7 @@ start() else mkdir -m 770 /dev/shm/qubes chown root.qubes /dev/shm/qubes - cp $DEFAULT /dev/shm/qubes/current_savefile + cp -a $(readlink $DEFAULT) /dev/shm/qubes/current_savefile chown root.qubes /dev/shm/qubes/current_savefile chmod 660 /dev/shm/qubes/current_savefile ln -s /dev/shm/qubes/current_savefile /var/run/qubes/current_savefile From 7b43755f33e90fcc22a88067eba8e1f2252c6de5 Mon Sep 17 00:00:00 2001 From: Rafal Wojtczuk Date: Sun, 10 Apr 2011 15:39:35 +0200 Subject: [PATCH 2/7] qfile-daemon-dvm: increase timeout of tray notification --- dom0/restore/qfile-daemon-dvm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom0/restore/qfile-daemon-dvm b/dom0/restore/qfile-daemon-dvm index 9cfa629e..6a41db24 100755 --- a/dom0/restore/qfile-daemon-dvm +++ b/dom0/restore/qfile-daemon-dvm @@ -102,7 +102,7 @@ class QfileDaemonDvm: def get_dvm(self): if not self.dvm_setup_ok(): - self.tray_notify("Updating DisposableVM savefile, please wait") + self.tray_notify("Updating DisposableVM savefile, please wait", 120000) if os.system("qvm-create-default-dvm --default-template --default-script >/var/run/qubes/qvm-create-default-dvm.stdout Date: Sun, 10 Apr 2011 22:54:17 +0200 Subject: [PATCH 3/7] v1.5.21-dom0 --- version_dom0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_dom0 b/version_dom0 index a7ccabdb..07a45d78 100644 --- a/version_dom0 +++ b/version_dom0 @@ -1 +1 @@ -1.5.20 +1.5.21 From 612228cea6353dcaebacc780607142aeb10dc1f2 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Sun, 10 Apr 2011 22:55:13 +0200 Subject: [PATCH 4/7] version 1.5.21 --- version_vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_vm b/version_vm index f6ed4357..07a45d78 100644 --- a/version_vm +++ b/version_vm @@ -1 +1 @@ -1.5.15 +1.5.21 From ce7fa7474f2a5c29ffcb3fbd3644a54f90b3875f Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Mon, 11 Apr 2011 11:35:25 +0200 Subject: [PATCH 5/7] vaio_fixes: pass special option to snd-hda-intel module (required to get sound on Vaio Z) --- dom0/vaio_fixes/snd-hda-intel-sony-vaio.conf | 1 + rpm_spec/core-dom0.spec | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 dom0/vaio_fixes/snd-hda-intel-sony-vaio.conf diff --git a/dom0/vaio_fixes/snd-hda-intel-sony-vaio.conf b/dom0/vaio_fixes/snd-hda-intel-sony-vaio.conf new file mode 100644 index 00000000..9089bddc --- /dev/null +++ b/dom0/vaio_fixes/snd-hda-intel-sony-vaio.conf @@ -0,0 +1 @@ +options snd-hda-intel model=sony-assamd diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec index 9fc3924c..3001e11b 100644 --- a/rpm_spec/core-dom0.spec +++ b/rpm_spec/core-dom0.spec @@ -130,6 +130,8 @@ cp pm-utils/02qubes-pause-vms $RPM_BUILD_ROOT/usr/lib64/pm-utils/sleep.d/ cp vaio_fixes/00sony-vaio-audio $RPM_BUILD_ROOT/usr/lib64/pm-utils/sleep.d/ cp vaio_fixes/99sony-vaio-audio $RPM_BUILD_ROOT/usr/lib64/pm-utils/sleep.d/ cp vaio_fixes/01sony-vaio-display $RPM_BUILD_ROOT/usr/lib64/pm-utils/sleep.d/ +mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d/ +cp vaio_fixes/snd-hda-intel-sony-vaio.conf $RPM_BUILD_ROOT/etc/modprobe.d/ mkdir -p $RPM_BUILD_ROOT/var/log/qubes mkdir -p $RPM_BUILD_ROOT/var/run/qubes @@ -316,3 +318,4 @@ suspend/resume. /usr/lib64/pm-utils/sleep.d/00sony-vaio-audio /usr/lib64/pm-utils/sleep.d/99sony-vaio-audio /usr/lib64/pm-utils/sleep.d/01sony-vaio-display +/etc/modprobe.d/snd-hda-intel-sony-vaio.conf From 95488dc59e99fffcf9c333a3b966595e7c9ad0d6 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Mon, 11 Apr 2011 14:47:02 +0200 Subject: [PATCH 6/7] Pass --level 5 for chkconfigs in core-dom0 post --- rpm_spec/core-dom0.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec index 3001e11b..e159543b 100644 --- a/rpm_spec/core-dom0.spec +++ b/rpm_spec/core-dom0.spec @@ -161,9 +161,9 @@ chkconfig --add qubes_core || echo "WARNING: Cannot add service qubes_core!" chkconfig --add qubes_netvm || echo "WARNING: Cannot add service qubes_netvm!" chkconfig --add qubes_setupdvm || echo "WARNING: Cannot add service qubes_setupdvm!" -chkconfig qubes_core on || echo "WARNING: Cannot enable service qubes_core!" -chkconfig qubes_netvm on || echo "WARNING: Cannot enable service qubes_netvm!" -chkconfig qubes_setupdvm on || echo "WARNING: Cannot enable service qubes_setupdvm!" +chkconfig --level 5 qubes_core on || echo "WARNING: Cannot enable service qubes_core!" +chkconfig --level 5 qubes_netvm on || echo "WARNING: Cannot enable service qubes_netvm!" +chkconfig --level 5 qubes_setupdvm on || echo "WARNING: Cannot enable service qubes_setupdvm!" HAD_SYSCONFIG_NETWORK=yes if ! [ -e /etc/sysconfig/network ]; then From 94c4ca27ddce6a43420de180618c221323b14093 Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Mon, 11 Apr 2011 22:02:53 +0200 Subject: [PATCH 7/7] version 1.5.22-dom0 --- version_dom0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_dom0 b/version_dom0 index 07a45d78..d532fd93 100644 --- a/version_dom0 +++ b/version_dom0 @@ -1 +1 @@ -1.5.21 +1.5.22