diff options
author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2013-06-17 21:57:45 +0000 |
---|---|---|
committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2013-07-01 16:50:46 +0000 |
commit | 4fb1c1b0e8ca8510c76d849e3b330c52934bca16 (patch) | |
tree | 047314f32e725fc347b211df3e009a3b024951c2 /tests/bscs-merge.pass | |
parent | aac14e2efc8d427760f29ca8878552e9cb509536 (diff) | |
download | tbdiff-4fb1c1b0e8ca8510c76d849e3b330c52934bca16.tar.gz |
Remove test mode and provide hooks to use a test suite.
Tests will now be handled by a test suite in a future commit, so this
mode will not be needed anymore. The test suite will work by replacing
the mounting script by a fake mounting script that points to a directory
with a systems folder.
Also add trap again, now that it is more tested.
Diffstat (limited to 'tests/bscs-merge.pass')
153 files changed, 1244 insertions, 0 deletions
diff --git a/tests/bscs-merge.pass/empty.in/systems/default b/tests/bscs-merge.pass/empty.in/systems/default new file mode 120000 index 0000000..0f51808 --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/default @@ -0,0 +1 @@ +factory
\ No newline at end of file diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-1 b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-2 b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-2 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1v2-2 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-1 b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-2 b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-2 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vu-2 diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vuv2-1 b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vuv2-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/factory/orig/etc/v1vuv2-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-1 b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-1 diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-2 b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-2 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vu-2 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vuv2-1 b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vuv2-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/v1vuv2-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-1 b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-1 diff --git a/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-2 b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-2 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/factory/run/etc/vuv2-2 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-1 b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-2 b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-2 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1v2-2 diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1vuv2-1 b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1vuv2-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/v1vuv2-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-1 b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-2 b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-2 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/version2/orig/etc/vuv2-2 diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-1 b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-2 b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-2 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1v2-2 diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1vuv2-1 b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1vuv2-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/v1vuv2-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-1 b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-2 b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-2 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/empty.in/systems/version2/run/etc/vuv2-2 diff --git a/tests/bscs-merge.pass/empty.out/systems/default b/tests/bscs-merge.pass/empty.out/systems/default new file mode 120000 index 0000000..0f51808 --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/default @@ -0,0 +1 @@ +factory
\ No newline at end of file diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-1 b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-2 b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-2 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1v2-2 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-1 b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-2 b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-2 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vu-2 diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vuv2-1 b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vuv2-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/factory/orig/etc/v1vuv2-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-1 b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-1 diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-2 b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-2 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vu-2 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vuv2-1 b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vuv2-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/v1vuv2-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-1 b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-1 diff --git a/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-2 b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-2 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/factory/run/etc/vuv2-2 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-1 b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-2 b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-2 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1v2-2 diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1vuv2-1 b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1vuv2-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/v1vuv2-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-1 b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-2 b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-2 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/version2/orig/etc/vuv2-2 diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-1 b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-2 b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-2 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1v2-2 diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-1 b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-1 diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-2 b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-2 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vu-2 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vuv2-1 b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vuv2-1 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/v1vuv2-1 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-1 b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-1 diff --git a/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-2 b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-2 new file mode 100644 index 0000000..a7f8d9e --- /dev/null +++ b/tests/bscs-merge.pass/empty.out/systems/version2/run/etc/vuv2-2 @@ -0,0 +1 @@ +bla diff --git a/tests/bscs-merge.pass/sshconf.in/systems/default b/tests/bscs-merge.pass/sshconf.in/systems/default new file mode 120000 index 0000000..0f51808 --- /dev/null +++ b/tests/bscs-merge.pass/sshconf.in/systems/default @@ -0,0 +1 @@ +factory
\ No newline at end of file diff --git a/tests/bscs-merge.pass/sshconf.in/systems/factory/orig/etc/sshd_config b/tests/bscs-merge.pass/sshconf.in/systems/factory/orig/etc/sshd_config new file mode 100644 index 0000000..98fa27e --- /dev/null +++ b/tests/bscs-merge.pass/sshconf.in/systems/factory/orig/etc/sshd_config @@ -0,0 +1,123 @@ +# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# The default requires explicit activation of protocol 1 +#Protocol 2 + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 + +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#RSAAuthentication yes +#PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +#UsePAM no + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#TCPKeepAlive yes +#UseLogin no +#UsePrivilegeSeparation yes +PermitUserEnvironment yes +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10 +#PermitTunnel no +#ChrootDirectory none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib/openssh/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server + +AcceptEnv LANG LC_* diff --git a/tests/bscs-merge.pass/sshconf.in/systems/factory/run/etc/sshd_config b/tests/bscs-merge.pass/sshconf.in/systems/factory/run/etc/sshd_config new file mode 100644 index 0000000..c4b25e9 --- /dev/null +++ b/tests/bscs-merge.pass/sshconf.in/systems/factory/run/etc/sshd_config @@ -0,0 +1,123 @@ +# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# The default requires explicit activation of protocol 1 +#Protocol 2 + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 + +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#RSAAuthentication yes +#PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +#UsePAM no + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#TCPKeepAlive yes +UseLogin no +#UsePrivilegeSeparation yes +PermitUserEnvironment yes +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10 +#PermitTunnel no +#ChrootDirectory none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib/openssh/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server + +AcceptEnv LANG LC_* diff --git a/tests/bscs-merge.pass/sshconf.in/systems/version2/orig/etc/sshd_config b/tests/bscs-merge.pass/sshconf.in/systems/version2/orig/etc/sshd_config new file mode 100644 index 0000000..4e6a5d3 --- /dev/null +++ b/tests/bscs-merge.pass/sshconf.in/systems/version2/orig/etc/sshd_config @@ -0,0 +1,123 @@ +# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# The default requires explicit activation of protocol 1 +#Protocol 2 + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 + +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#RSAAuthentication yes +#PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +#UsePAM no + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#TCPKeepAlive yes +#UseLogin no +#UsePrivilegeSeparation yes +PermitUserEnvironment yes +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10 +#PermitTunnel no +ChrootDirectory none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib/openssh/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server + +AcceptEnv LANG LC_* diff --git a/tests/bscs-merge.pass/sshconf.in/systems/version2/run/etc/sshd_config b/tests/bscs-merge.pass/sshconf.in/systems/version2/run/etc/sshd_config new file mode 100644 index 0000000..4e6a5d3 --- /dev/null +++ b/tests/bscs-merge.pass/sshconf.in/systems/version2/run/etc/sshd_config @@ -0,0 +1,123 @@ +# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# The default requires explicit activation of protocol 1 +#Protocol 2 + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 + +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#RSAAuthentication yes +#PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +#UsePAM no + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#TCPKeepAlive yes +#UseLogin no +#UsePrivilegeSeparation yes +PermitUserEnvironment yes +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10 +#PermitTunnel no +ChrootDirectory none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib/openssh/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server + +AcceptEnv LANG LC_* diff --git a/tests/bscs-merge.pass/sshconf.out/systems/default b/tests/bscs-merge.pass/sshconf.out/systems/default new file mode 120000 index 0000000..0f51808 --- /dev/null +++ b/tests/bscs-merge.pass/sshconf.out/systems/default @@ -0,0 +1 @@ +factory
\ No newline at end of file diff --git a/tests/bscs-merge.pass/sshconf.out/systems/factory/orig/etc/sshd_config b/tests/bscs-merge.pass/sshconf.out/systems/factory/orig/etc/sshd_config new file mode 100644 index 0000000..98fa27e --- /dev/null +++ b/tests/bscs-merge.pass/sshconf.out/systems/factory/orig/etc/sshd_config @@ -0,0 +1,123 @@ +# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# The default requires explicit activation of protocol 1 +#Protocol 2 + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 + +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#RSAAuthentication yes +#PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +#UsePAM no + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#TCPKeepAlive yes +#UseLogin no +#UsePrivilegeSeparation yes +PermitUserEnvironment yes +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10 +#PermitTunnel no +#ChrootDirectory none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib/openssh/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server + +AcceptEnv LANG LC_* diff --git a/tests/bscs-merge.pass/sshconf.out/systems/factory/run/etc/sshd_config b/tests/bscs-merge.pass/sshconf.out/systems/factory/run/etc/sshd_config new file mode 100644 index 0000000..c4b25e9 --- /dev/null +++ b/tests/bscs-merge.pass/sshconf.out/systems/factory/run/etc/sshd_config @@ -0,0 +1,123 @@ +# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# The default requires explicit activation of protocol 1 +#Protocol 2 + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 + +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#RSAAuthentication yes +#PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +#UsePAM no + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#TCPKeepAlive yes +UseLogin no +#UsePrivilegeSeparation yes +PermitUserEnvironment yes +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10 +#PermitTunnel no +#ChrootDirectory none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib/openssh/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server + +AcceptEnv LANG LC_* diff --git a/tests/bscs-merge.pass/sshconf.out/systems/version2/orig/etc/sshd_config b/tests/bscs-merge.pass/sshconf.out/systems/version2/orig/etc/sshd_config new file mode 100644 index 0000000..4e6a5d3 --- /dev/null +++ b/tests/bscs-merge.pass/sshconf.out/systems/version2/orig/etc/sshd_config @@ -0,0 +1,123 @@ +# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# The default requires explicit activation of protocol 1 +#Protocol 2 + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 + +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#RSAAuthentication yes +#PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +#UsePAM no + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#TCPKeepAlive yes +#UseLogin no +#UsePrivilegeSeparation yes +PermitUserEnvironment yes +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10 +#PermitTunnel no +ChrootDirectory none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib/openssh/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server + +AcceptEnv LANG LC_* diff --git a/tests/bscs-merge.pass/sshconf.out/systems/version2/run/etc/sshd_config b/tests/bscs-merge.pass/sshconf.out/systems/version2/run/etc/sshd_config new file mode 100644 index 0000000..469d4f5 --- /dev/null +++ b/tests/bscs-merge.pass/sshconf.out/systems/version2/run/etc/sshd_config @@ -0,0 +1,123 @@ +# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# The default requires explicit activation of protocol 1 +#Protocol 2 + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 + +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#RSAAuthentication yes +#PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +#UsePAM no + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#TCPKeepAlive yes +UseLogin no +#UsePrivilegeSeparation yes +PermitUserEnvironment yes +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10 +#PermitTunnel no +ChrootDirectory none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib/openssh/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server + +AcceptEnv LANG LC_* diff --git a/tests/bscs-merge.pass/symblinks.in/systems/default b/tests/bscs-merge.pass/symblinks.in/systems/default new file mode 120000 index 0000000..0f51808 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/default @@ -0,0 +1 @@ +factory
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1 b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1 new file mode 120000 index 0000000..446ec55 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1 @@ -0,0 +1 @@ +../../../../v1
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1v2 b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1v2 new file mode 120000 index 0000000..446ec55 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1v2 @@ -0,0 +1 @@ +../../../../v1
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vu b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vu new file mode 120000 index 0000000..446ec55 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vu @@ -0,0 +1 @@ +../../../../v1
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vuv2 b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vuv2 new file mode 120000 index 0000000..446ec55 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/v1vuv2 @@ -0,0 +1 @@ +../../../../v1
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vu b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vu new file mode 120000 index 0000000..2abd9b7 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vu @@ -0,0 +1 @@ +../../../../vu
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vuv2 b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vuv2 new file mode 120000 index 0000000..2abd9b7 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/v1vuv2 @@ -0,0 +1 @@ +../../../../vu
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vu b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vu new file mode 120000 index 0000000..2abd9b7 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vu @@ -0,0 +1 @@ +../../../../vu
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vuv2 b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vuv2 new file mode 120000 index 0000000..2abd9b7 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/vuv2 @@ -0,0 +1 @@ +../../../../vu
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1v2 b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1v2 new file mode 120000 index 0000000..e403242 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1v2 @@ -0,0 +1 @@ +../../../../v2
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1vuv2 b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1vuv2 new file mode 120000 index 0000000..e403242 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v1vuv2 @@ -0,0 +1 @@ +../../../../v2
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v2 b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v2 new file mode 120000 index 0000000..e403242 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/v2 @@ -0,0 +1 @@ +../../../../v2
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/vuv2 b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/vuv2 new file mode 120000 index 0000000..e403242 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/vuv2 @@ -0,0 +1 @@ +../../../../v2
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1v2 b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1v2 new file mode 120000 index 0000000..e403242 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1v2 @@ -0,0 +1 @@ +../../../../v2
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1vuv2 b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1vuv2 new file mode 120000 index 0000000..e403242 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v1vuv2 @@ -0,0 +1 @@ +../../../../v2
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v2 b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v2 new file mode 120000 index 0000000..e403242 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/v2 @@ -0,0 +1 @@ +../../../../v2
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/vuv2 b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/vuv2 new file mode 120000 index 0000000..e403242 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/vuv2 @@ -0,0 +1 @@ +../../../../v2
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.in/v1 b/tests/bscs-merge.pass/symblinks.in/v1 new file mode 100644 index 0000000..626799f --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/v1 @@ -0,0 +1 @@ +v1 diff --git a/tests/bscs-merge.pass/symblinks.in/v2 b/tests/bscs-merge.pass/symblinks.in/v2 new file mode 100644 index 0000000..8c1384d --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/v2 @@ -0,0 +1 @@ +v2 diff --git a/tests/bscs-merge.pass/symblinks.in/vu b/tests/bscs-merge.pass/symblinks.in/vu new file mode 100644 index 0000000..4782f39 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.in/vu @@ -0,0 +1 @@ +vu diff --git a/tests/bscs-merge.pass/symblinks.out/systems/default b/tests/bscs-merge.pass/symblinks.out/systems/default new file mode 120000 index 0000000..0f51808 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/default @@ -0,0 +1 @@ +factory
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1 b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1 new file mode 120000 index 0000000..446ec55 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1 @@ -0,0 +1 @@ +../../../../v1
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1v2 b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1v2 new file mode 120000 index 0000000..446ec55 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1v2 @@ -0,0 +1 @@ +../../../../v1
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vu b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vu new file mode 120000 index 0000000..446ec55 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vu @@ -0,0 +1 @@ +../../../../v1
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vuv2 b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vuv2 new file mode 120000 index 0000000..446ec55 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/v1vuv2 @@ -0,0 +1 @@ +../../../../v1
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vu b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vu new file mode 120000 index 0000000..2abd9b7 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vu @@ -0,0 +1 @@ +../../../../vu
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vuv2 b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vuv2 new file mode 120000 index 0000000..2abd9b7 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/v1vuv2 @@ -0,0 +1 @@ +../../../../vu
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vu b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vu new file mode 120000 index 0000000..2abd9b7 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vu @@ -0,0 +1 @@ +../../../../vu
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vuv2 b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vuv2 new file mode 120000 index 0000000..2abd9b7 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/vuv2 @@ -0,0 +1 @@ +../../../../vu
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1v2 b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1v2 new file mode 120000 index 0000000..e403242 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1v2 @@ -0,0 +1 @@ +../../../../v2
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1vuv2 b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1vuv2 new file mode 120000 index 0000000..e403242 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v1vuv2 @@ -0,0 +1 @@ +../../../../v2
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v2 b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v2 new file mode 120000 index 0000000..e403242 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/v2 @@ -0,0 +1 @@ +../../../../v2
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/vuv2 b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/vuv2 new file mode 120000 index 0000000..e403242 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/vuv2 @@ -0,0 +1 @@ +../../../../v2
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1 b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1 new file mode 120000 index 0000000..446ec55 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1 @@ -0,0 +1 @@ +../../../../v1
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1v2 b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1v2 new file mode 120000 index 0000000..e403242 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1v2 @@ -0,0 +1 @@ +../../../../v2
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vu b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vu new file mode 120000 index 0000000..2abd9b7 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vu @@ -0,0 +1 @@ +../../../../vu
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vuv2 b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vuv2 new file mode 120000 index 0000000..2abd9b7 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v1vuv2 @@ -0,0 +1 @@ +../../../../vu
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v2 b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v2 new file mode 120000 index 0000000..e403242 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/v2 @@ -0,0 +1 @@ +../../../../v2
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vu b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vu new file mode 120000 index 0000000..2abd9b7 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vu @@ -0,0 +1 @@ +../../../../vu
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vuv2 b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vuv2 new file mode 120000 index 0000000..2abd9b7 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/vuv2 @@ -0,0 +1 @@ +../../../../vu
\ No newline at end of file diff --git a/tests/bscs-merge.pass/symblinks.out/v1 b/tests/bscs-merge.pass/symblinks.out/v1 new file mode 100644 index 0000000..626799f --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/v1 @@ -0,0 +1 @@ +v1 diff --git a/tests/bscs-merge.pass/symblinks.out/v2 b/tests/bscs-merge.pass/symblinks.out/v2 new file mode 100644 index 0000000..8c1384d --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/v2 @@ -0,0 +1 @@ +v2 diff --git a/tests/bscs-merge.pass/symblinks.out/vu b/tests/bscs-merge.pass/symblinks.out/vu new file mode 100644 index 0000000..4782f39 --- /dev/null +++ b/tests/bscs-merge.pass/symblinks.out/vu @@ -0,0 +1 @@ +vu diff --git a/tests/bscs-merge.pass/upgrades.in/systems/default b/tests/bscs-merge.pass/upgrades.in/systems/default new file mode 120000 index 0000000..0f51808 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/default @@ -0,0 +1 @@ +factory
\ No newline at end of file diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file1 b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file1 new file mode 100644 index 0000000..b73be5d --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file1 @@ -0,0 +1,2 @@ +whereami=v1 +version=v1 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file4 b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file4 new file mode 100644 index 0000000..9972a7a --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file4 @@ -0,0 +1,2 @@ +whereami=v1,v2 +version=v1 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file5 b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file5 new file mode 100644 index 0000000..8fbeda2 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file5 @@ -0,0 +1,2 @@ +whereami=v1,vu +version=v1 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7 b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7 new file mode 100644 index 0000000..7c1f4fb --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=v1 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7.1 b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7.1 new file mode 100644 index 0000000..d579e7b --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/file7.1 @@ -0,0 +1,8 @@ +a=1 +b=2 +c=3 +whereami=v1,vu,v2 +version=v1 +d=1 +e=2 +f=3 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/subdir1/subfile1 b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/subdir1/subfile1 new file mode 100644 index 0000000..1cb075e --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/subdir1/subfile1 @@ -0,0 +1,10 @@ +qeq asda d +s +d +a sd +a +d +a +d + +d diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/subdir1/subsubdir2/subsubfile4 b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/subdir1/subsubdir2/subsubfile4 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/orig/etc/subdir1/subsubdir2/subsubfile4 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file2 b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file2 new file mode 100644 index 0000000..9fa9381 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file2 @@ -0,0 +1,2 @@ +whereami=vu +version=vu diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file5 b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file5 new file mode 100644 index 0000000..eddf4ca --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file5 @@ -0,0 +1,2 @@ +whereami=v1,vu +version=vu diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file6 b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file6 new file mode 100644 index 0000000..9802a97 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file6 @@ -0,0 +1,2 @@ +whereami=vu,v2 +version=vu diff --git a/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file7 b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file7 new file mode 100644 index 0000000..24553ad --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/factory/run/etc/file7 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=vu diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file3 b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file3 new file mode 100644 index 0000000..b1580e3 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file3 @@ -0,0 +1,2 @@ +whereami=vu +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file4 b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file4 new file mode 100644 index 0000000..ebc4914 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file4 @@ -0,0 +1,2 @@ +whereami=v1,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file6 b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file6 new file mode 100644 index 0000000..e76efb0 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file6 @@ -0,0 +1,2 @@ +whereami=vu,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7 b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7 new file mode 100644 index 0000000..93c46eb --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7.1 b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7.1 new file mode 100644 index 0000000..2462a4f --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/file7.1 @@ -0,0 +1,8 @@ +a=1 +b=2 +c=3 +whereami=v1,vu,v2 +version=v2 +d=1 +e=2 +f=3 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subfile1 b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subfile1 new file mode 100644 index 0000000..1cb075e --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subfile1 @@ -0,0 +1,10 @@ +qeq asda d +s +d +a sd +a +d +a +d + +d diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4 b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file3 b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file3 new file mode 100644 index 0000000..b1580e3 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file3 @@ -0,0 +1,2 @@ +whereami=vu +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file4 b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file4 new file mode 100644 index 0000000..ebc4914 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file4 @@ -0,0 +1,2 @@ +whereami=v1,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file6 b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file6 new file mode 100644 index 0000000..e76efb0 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file6 @@ -0,0 +1,2 @@ +whereami=vu,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7 b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7 new file mode 100644 index 0000000..93c46eb --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7.1 b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7.1 new file mode 100644 index 0000000..2462a4f --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/file7.1 @@ -0,0 +1,8 @@ +a=1 +b=2 +c=3 +whereami=v1,vu,v2 +version=v2 +d=1 +e=2 +f=3 diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subfile1 b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subfile1 new file mode 100644 index 0000000..1cb075e --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subfile1 @@ -0,0 +1,10 @@ +qeq asda d +s +d +a sd +a +d +a +d + +d diff --git a/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4 b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.in/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/default b/tests/bscs-merge.pass/upgrades.out/systems/default new file mode 120000 index 0000000..0f51808 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/default @@ -0,0 +1 @@ +factory
\ No newline at end of file diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file1 b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file1 new file mode 100644 index 0000000..b73be5d --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file1 @@ -0,0 +1,2 @@ +whereami=v1 +version=v1 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file4 b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file4 new file mode 100644 index 0000000..9972a7a --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file4 @@ -0,0 +1,2 @@ +whereami=v1,v2 +version=v1 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file5 b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file5 new file mode 100644 index 0000000..8fbeda2 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file5 @@ -0,0 +1,2 @@ +whereami=v1,vu +version=v1 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7 b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7 new file mode 100644 index 0000000..7c1f4fb --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=v1 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7.1 b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7.1 new file mode 100644 index 0000000..d579e7b --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/file7.1 @@ -0,0 +1,8 @@ +a=1 +b=2 +c=3 +whereami=v1,vu,v2 +version=v1 +d=1 +e=2 +f=3 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/subdir1/subfile1 b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/subdir1/subfile1 new file mode 100644 index 0000000..1cb075e --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/subdir1/subfile1 @@ -0,0 +1,10 @@ +qeq asda d +s +d +a sd +a +d +a +d + +d diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/subdir1/subsubdir2/subsubfile4 b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/subdir1/subsubdir2/subsubfile4 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/orig/etc/subdir1/subsubdir2/subsubfile4 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file2 b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file2 new file mode 100644 index 0000000..9fa9381 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file2 @@ -0,0 +1,2 @@ +whereami=vu +version=vu diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file5 b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file5 new file mode 100644 index 0000000..eddf4ca --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file5 @@ -0,0 +1,2 @@ +whereami=v1,vu +version=vu diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file6 b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file6 new file mode 100644 index 0000000..9802a97 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file6 @@ -0,0 +1,2 @@ +whereami=vu,v2 +version=vu diff --git a/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file7 b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file7 new file mode 100644 index 0000000..24553ad --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/factory/run/etc/file7 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=vu diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file3 b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file3 new file mode 100644 index 0000000..b1580e3 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file3 @@ -0,0 +1,2 @@ +whereami=vu +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file4 b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file4 new file mode 100644 index 0000000..ebc4914 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file4 @@ -0,0 +1,2 @@ +whereami=v1,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file6 b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file6 new file mode 100644 index 0000000..e76efb0 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file6 @@ -0,0 +1,2 @@ +whereami=vu,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7 b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7 new file mode 100644 index 0000000..93c46eb --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7.1 b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7.1 new file mode 100644 index 0000000..2462a4f --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/file7.1 @@ -0,0 +1,8 @@ +a=1 +b=2 +c=3 +whereami=v1,vu,v2 +version=v2 +d=1 +e=2 +f=3 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/subdir1/subfile1 b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/subdir1/subfile1 new file mode 100644 index 0000000..1cb075e --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/subdir1/subfile1 @@ -0,0 +1,10 @@ +qeq asda d +s +d +a sd +a +d +a +d + +d diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4 b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/orig/etc/subdir1/subsubdir2/subsubfile4 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file1 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file1 new file mode 100644 index 0000000..b73be5d --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file1 @@ -0,0 +1,2 @@ +whereami=v1 +version=v1 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file2 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file2 new file mode 100644 index 0000000..9fa9381 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file2 @@ -0,0 +1,2 @@ +whereami=vu +version=vu diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file3 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file3 new file mode 100644 index 0000000..b1580e3 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file3 @@ -0,0 +1,2 @@ +whereami=vu +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file4 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file4 new file mode 100644 index 0000000..ebc4914 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file4 @@ -0,0 +1,2 @@ +whereami=v1,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file5 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file5 new file mode 100644 index 0000000..eddf4ca --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file5 @@ -0,0 +1,2 @@ +whereami=v1,vu +version=vu diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file6 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file6 new file mode 100644 index 0000000..9802a97 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file6 @@ -0,0 +1,2 @@ +whereami=vu,v2 +version=vu diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7 new file mode 100644 index 0000000..93c46eb --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=v2 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.1 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.1 new file mode 100644 index 0000000..2462a4f --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.1 @@ -0,0 +1,8 @@ +a=1 +b=2 +c=3 +whereami=v1,vu,v2 +version=v2 +d=1 +e=2 +f=3 diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.rej b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.rej new file mode 100644 index 0000000..13f6156 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/file7.rej @@ -0,0 +1,6 @@ +--- file7 ++++ file7 +@@ -1,2 +1,2 @@ + whereami=v1,vu,v2 +-version=v1 ++version=vu diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subfile1 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subfile1 new file mode 100644 index 0000000..1cb075e --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subfile1 @@ -0,0 +1,10 @@ +qeq asda d +s +d +a sd +a +d +a +d + +d diff --git a/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4 b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/bscs-merge.pass/upgrades.out/systems/version2/run/etc/subdir1/subsubdir2/subsubfile4 |