From 550307379748dd440986510d9a6a423881d48169 Mon Sep 17 00:00:00 2001 From: rbalocca Date: Fri, 7 Mar 2008 16:33:06 -0800 Subject: Fix for bug #2921 ( http://bugzilla.vyatta.com/show_bug.cgi?id=2921 ) --- templates/system/package/repository/node.def | 3 --- 1 file changed, 3 deletions(-) (limited to 'templates/system/package/repository/node.def') diff --git a/templates/system/package/repository/node.def b/templates/system/package/repository/node.def index e07967ee..7dc48a3d 100644 --- a/templates/system/package/repository/node.def +++ b/templates/system/package/repository/node.def @@ -1,9 +1,6 @@ tag: type: txt help: Name describing the repository -commit:expression: $VAR(./url/) != ""; "Must configure the repository URL" -commit:expression: $VAR(./distribution/) != ""; "Must configure the repository distribution" -commit:expression: $VAR(./components/) != ""; "Must configure the repository component" update:expression: "sudo sh -c \"touch /etc/apt/sources.list && \ sed -i '\\!# $VAR(@) #!d' /etc/apt/sources.list && \ echo \\\"deb $VAR(url/@)/ $VAR(distribution/@) $VAR(components/@) # $VAR(@) #\\\" >> /etc/apt/sources.list\" " -- cgit v1.2.3 From 5fe4e9633b235cbc757e4d2340112f7ff5e41ce1 Mon Sep 17 00:00:00 2001 From: rbalocca Date: Fri, 7 Mar 2008 16:37:54 -0800 Subject: Revert "Fix for bug #2921 ( http://bugzilla.vyatta.com/show_bug.cgi?id=2921 )" This reverts commit 550307379748dd440986510d9a6a423881d48169. --- templates/system/package/repository/node.def | 3 +++ 1 file changed, 3 insertions(+) (limited to 'templates/system/package/repository/node.def') diff --git a/templates/system/package/repository/node.def b/templates/system/package/repository/node.def index 7dc48a3d..e07967ee 100644 --- a/templates/system/package/repository/node.def +++ b/templates/system/package/repository/node.def @@ -1,6 +1,9 @@ tag: type: txt help: Name describing the repository +commit:expression: $VAR(./url/) != ""; "Must configure the repository URL" +commit:expression: $VAR(./distribution/) != ""; "Must configure the repository distribution" +commit:expression: $VAR(./components/) != ""; "Must configure the repository component" update:expression: "sudo sh -c \"touch /etc/apt/sources.list && \ sed -i '\\!# $VAR(@) #!d' /etc/apt/sources.list && \ echo \\\"deb $VAR(url/@)/ $VAR(distribution/@) $VAR(components/@) # $VAR(@) #\\\" >> /etc/apt/sources.list\" " -- cgit v1.2.3 From 38063621a29910b631561ecce6e5b524b09233e4 Mon Sep 17 00:00:00 2001 From: rbalocca Date: Fri, 7 Mar 2008 17:28:41 -0800 Subject: Improve the package repository template --- templates/system/package/repository/node.def | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'templates/system/package/repository/node.def') diff --git a/templates/system/package/repository/node.def b/templates/system/package/repository/node.def index e07967ee..d2e4cf38 100644 --- a/templates/system/package/repository/node.def +++ b/templates/system/package/repository/node.def @@ -1,11 +1,16 @@ tag: + type: txt -help: Name describing the repository + +help: Name a debian archive + commit:expression: $VAR(./url/) != ""; "Must configure the repository URL" commit:expression: $VAR(./distribution/) != ""; "Must configure the repository distribution" -commit:expression: $VAR(./components/) != ""; "Must configure the repository component" -update:expression: "sudo sh -c \"touch /etc/apt/sources.list && \ +commit:expression: $VAR(./components/) != ""; "Must configure the repository components" + +update: sudo sh -c "touch /etc/apt/sources.list && \ sed -i '\\!# $VAR(@) #!d' /etc/apt/sources.list && \ -echo \\\"deb $VAR(url/@)/ $VAR(distribution/@) $VAR(components/@) # $VAR(@) #\\\" >> /etc/apt/sources.list\" " -delete:expression: "sudo sh -c \"touch /etc/apt/sources.list && \ -sed -i '\\!# $VAR(@) #!d' /etc/apt/sources.list\" " +echo \"deb $VAR(url/@)/ $VAR(distribution/@) $VAR(components/@) # $VAR(@) #\" >> /etc/apt/sources.list" + +delete: sudo sh -c "touch /etc/apt/sources.list && \ +sed -i '\\!# $VAR(@) #!d' /etc/apt/sources.list" -- cgit v1.2.3