| author | Yiteng Zhang <yiteng.zhang@oracle.com> |
| Tue, 26 Jan 2016 13:08:18 -0800 | |
| changeset 5341 | acafdc8d7dfc |
| parent 5262 | 86d81f5e0391 |
| permissions | -rw-r--r-- |
|
5262
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
1 |
Patch to account for differing output of /usr/bin/sum on Solaris. This fix has been |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
2 |
integrated into Augeas in version 1.4.0. This patch should be removed when Augeas |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
3 |
is upgraded. |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
4 |
|
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
5 |
--- augeas-1.3.0/tests/test-put-symlink-augsave.sh.orig 2015-05-28 14:25:00.307497157 -0700 |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
6 |
+++ augeas-1.3.0/tests/test-put-symlink-augsave.sh 2015-05-28 14:25:38.148551120 -0700 |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
7 |
@@ -17,7 +17,7 @@ |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
8 |
cat <<EOF > $HOSTS |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
9 |
127.0.0.1 localhost |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
10 |
EOF |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
11 |
-HOSTS_SUM=$(sum $HOSTS) |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
12 |
+HOSTS_SUM=$(sum $HOSTS | cut -d ' ' -f 1) |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
13 |
|
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
14 |
touch $ATTACK_FILE |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
15 |
(cd $(dirname $HOSTS) && ln -s ../other/attack $(basename $HOSTS).augsave) |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
16 |
@@ -37,7 +37,7 @@ |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
17 |
exit 1 |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
18 |
fi |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
19 |
|
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
20 |
-if [ ! "x${HOSTS_SUM}" = "x$(sum $HOSTS_AUGSAVE)" ]; then
|
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
21 |
+if [ ! "x${HOSTS_SUM}" = "x$(sum $HOSTS_AUGSAVE | cut -d ' ' -f 1)" ]; then
|
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
22 |
echo "/etc/hosts.augsave has changed from the original /etc/hosts" |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
23 |
exit 1 |
|
86d81f5e0391
PSARC/2015/140 Augeas 1.3.0
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
diff
changeset
|
24 |
fi |