[Python-apps-commits] r10554 - in packages/slapos.core/trunk/debian (3 files)

[arnau at users.alioth.debian.org]

    Date: Friday, February 21, 2014 @ 12:00:58
  Author: arnau
Revision: 10554

Fix upstream replace regular expression which is too greedy.

Modified:
  packages/slapos.core/trunk/debian/changelog
  packages/slapos.core/trunk/debian/conf/slapos-node-unofficial.cfg
  packages/slapos.core/trunk/debian/patches/series

Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog	2014-02-21 11:58:18 UTC (rev 10553)
+++ packages/slapos.core/trunk/debian/changelog	2014-02-21 12:00:58 UTC (rev 10554)
@@ -4,6 +4,8 @@
     + debian/slapos-node-unofficial.install: Added.
     + debian/patches/system_configuration_file_by_default.patch:
       - Fix paths statically set to use system-wide ones.
+    + debian/patches/fix_register_configuration_replace.patch:
+      - Fix upstream replace regular expression which is too greedy.
   * debian/conf/slapos-node-unofficial.cfg:
     + bridge_name has been deprecated upstream by interface_name
       a long time ago.

Modified: packages/slapos.core/trunk/debian/conf/slapos-node-unofficial.cfg
===================================================================
--- packages/slapos.core/trunk/debian/conf/slapos-node-unofficial.cfg	2014-02-21 11:58:18 UTC (rev 10553)
+++ packages/slapos.core/trunk/debian/conf/slapos-node-unofficial.cfg	2014-02-21 12:00:58 UTC (rev 10554)
@@ -16,7 +16,8 @@
 log_file = /var/log/slapos/slapos-node-format.log
 partition_amount = 10
 ipv4_local_network = 10.0.0.0/16
-bridge_name = slapbr0
+interface_name = slapbr0
+create_tap = true
 tap_base_name = slaptap
 partition_base_name = slappart
 user_base_name = slapuser

Modified: packages/slapos.core/trunk/debian/patches/series
===================================================================
--- packages/slapos.core/trunk/debian/patches/series	2014-02-21 11:58:18 UTC (rev 10553)
+++ packages/slapos.core/trunk/debian/patches/series	2014-02-21 12:00:58 UTC (rev 10554)
@@ -1,3 +1,4 @@
 system_configuration_file_by_default.patch
+fix_register_configuration_replace.patch
 fix_setup_depends.patch
 slapos_command_split_up.patch