java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7192bfb40384503cba9818d05827438cfc354270
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Oct 26 13:23:10 2011 +0200
When there are not ks-pre.log files, do not return error.
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
index 6725be1..8f170f0 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -134,7 +134,7 @@ public class KickstartFormatter {
"cp -fa /tmp/ks-tree-shadow/* /mnt/sysimage/tmp/ks-tree-copy" + NEWLINE
+
"fi" + NEWLINE +
"cp /etc/resolv.conf /mnt/sysimage/etc/resolv.conf" + NEWLINE +
- "cp -f /tmp/ks-pre.log* /mnt/sysimage/root/" + NEWLINE;
+ "cp -f /tmp/ks-pre.log* /mnt/sysimage/root/ || :" + NEWLINE;
private static final String RHN_TRACE = "set -x" + NEWLINE;
private static final String XMLRPC_HOST =
Config.get().getString(ConfigDefaults.KICKSTART_HOST,
"xmlrpc.rhn.redhat.com");
Show replies by date