[PATCH rhel7-branch] Tweak tmux configuration file
by Chris Lumens
From: Jiri Konecny <jkonecny(a)redhat.com>
Add information how to switch tabs and how to show help to the right
side of the status line.
Alt+Tab can be used to change windows(tabs) now.
History is set to 10000 lines instead of 2000(default).
Resolves: rhbz#1238799
---
data/tmux.conf | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/data/tmux.conf b/data/tmux.conf
index 80620ba..89f788b 100644
--- a/data/tmux.conf
+++ b/data/tmux.conf
@@ -1,12 +1,16 @@
# tmux.conf for the anaconda environment
+
+bind -n M-tab next
+bind -n F1 list-keys
+
set-option -s exit-unattached off
set-option -g base-index 1
set-option -g set-remain-on-exit on
+set-option -g history-limit 10000
new-session -s anaconda -n main "anaconda"
-set-option status-right ""
-set-option status-right-length 0
+set-option status-right '#[fg=blue]#(echo -n "Switch tab: Alt+Tab | Help: F1 ")'
new-window -d -n shell "bash --login"
new-window -d -n log "tail -F /tmp/anaconda.log"
--
2.4.3
8 years, 9 months
Updated: [rhinstaller/anaconda/pulls/257 master] Early disk snapshot
by dashea
This is the port of the early disk snapshot stuff we implemented for the Fedora 22 on the *f22-branch*. Turns out a better and reliable solution for a number of bugs these changes fixed and prevented won't be available any time soon so I'm porting this to the master branch to prevent serious regressions.
There have been some conflicts, basically all caused by the fixes for kickstart autopart missing passphrase and by changes done for the s390 stuff moved from blivet to libblockdev.
--
To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/257
8 years, 9 months
[PATCH] Change how success is checked for the basic-ostree test.
by Chris Lumens
The reboot test is flawed because the actual location of /root/RESULT may
move around. We can't count on its location always being the same. Also,
rebooting doesn't really test anaconda in any way. It also tests that dracut
and everything else works right, which is more than we need. Those things
may fail while anaconda itself still performed the install correctly.
---
tests/kickstart_tests/basic-ostree.ks | 23 +++--------------------
tests/kickstart_tests/basic-ostree.sh | 28 ----------------------------
2 files changed, 3 insertions(+), 48 deletions(-)
diff --git a/tests/kickstart_tests/basic-ostree.ks b/tests/kickstart_tests/basic-ostree.ks
index 63b6dae..9fe1509 100644
--- a/tests/kickstart_tests/basic-ostree.ks
+++ b/tests/kickstart_tests/basic-ostree.ks
@@ -14,24 +14,7 @@ timezone America/New_York
rootpw qweqwe
shutdown
-%post
-cat <<EOF > /lib/systemd/system/default.target.wants/run-test.service
-[Unit]
-Description=Run a test to see if anaconda+ostree worked
-After=basic.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/run-test.sh
-EOF
-
-cat <<EOF > /usr/bin/run-test.sh
-#!/bin/bash
-
-# For now, just the fact that we rebooted is good enough.
-echo SUCCESS > /root/RESULT
-shutdown -h now
-EOF
-
-chmod +x /usr/bin/run-test.sh
+%post --nochroot
+mkdir -p /mnt/sysimage/root/
+echo SUCCESS > /mnt/sysimage/root/RESULT
%end
diff --git a/tests/kickstart_tests/basic-ostree.sh b/tests/kickstart_tests/basic-ostree.sh
index 215d3e3..e193854 100755
--- a/tests/kickstart_tests/basic-ostree.sh
+++ b/tests/kickstart_tests/basic-ostree.sh
@@ -32,31 +32,3 @@ prepare() {
sed -e "/ostreesetup/ s|REPO|${KSTEST_OSTREE_REPO}|" ${ks} > ${tmpdir}/kickstart.ks
echo ${tmpdir}/kickstart.ks
}
-
-validate() {
- disksdir=$1
- qemuArgs=$(for d in ${disksdir}/disk-*img; do echo -drive file=${d}; done)
- virtCatArgs=$(for d in ${disksdir}/disk-*img; do echo -a ${d}; done)
-
- # Now attempt to boot the resulting VM and see if the install
- # actually worked. The VM will shut itself down so there's no
- # need to worry with that here.
- timeout 5m /usr/bin/qemu-kvm -m 2048 \
- -smp 2 \
- ${qemuArgs} \
- -vnc localhost:3
-
- # There should be a /root/RESULT file with results in it. Check
- # its contents and decide whether the test finally succeeded or
- # not.
- result=$(virt-cat ${virtCatArgs} -m /dev/mapper/fedora-root /ostree/deploy/fedora-atomic/var/roothome/RESULT)
- if [[ $? != 0 ]]; then
- status=1
- echo '*** /root/RESULT does not exist in VM image.'
- elif [[ "${result}" != "SUCCESS" ]]; then
- status=1
- echo "${result}"
- fi
-
- return ${status}
-}
--
2.4.3
8 years, 9 months
[PATCH] Make sure the liveimg test shuts down when it finishes.
by Chris Lumens
---
tests/kickstart_tests/liveimg.ks | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/kickstart_tests/liveimg.ks b/tests/kickstart_tests/liveimg.ks
index fdead27..20c78fa 100644
--- a/tests/kickstart_tests/liveimg.ks
+++ b/tests/kickstart_tests/liveimg.ks
@@ -14,6 +14,7 @@ lang en
timezone America/New_York
rootpw qweqwe
+shutdown
%post
if [[ ! -e /etc/passwd ]]; then
--
2.4.3
8 years, 9 months