diff options
| author | Tom Grennan <tgrennan@vyatta.com> | 2008-01-23 16:08:22 -0800 |
|---|---|---|
| committer | Tom Grennan <tgrennan@vyatta.com> | 2008-01-23 16:08:22 -0800 |
| commit | 63701b09b34dfedfe2e7e0515e200a27802cf762 (patch) | |
| tree | 3473bd1050176c5d48d5484c9244cecaa79bbeb8 | |
| parent | 411ea581185a36888b1f4dd2b027541b4e029443 (diff) | |
| parent | 6b6b806ff3ec38d5ec7fbe2ea9c42e9692340bb0 (diff) | |
| download | vyatta-cfg-system-63701b09b34dfedfe2e7e0515e200a27802cf762.tar.gz vyatta-cfg-system-63701b09b34dfedfe2e7e0515e200a27802cf762.zip | |
Merge commit 'origin/glendale' into glendale
6 files changed, 19 insertions, 13 deletions
diff --git a/sysconf/config.boot.default b/sysconf/config.boot.default index 941507f0..b0eda7ad 100644 --- a/sysconf/config.boot.default +++ b/sysconf/config.boot.default @@ -14,7 +14,8 @@ system { } package { repository community { - component: "main" + distribution: "community" + components: "main" url: "http://archive.vyatta.com/vyatta" } } diff --git a/templates/system/package/repository/node.def b/templates/system/package/repository/node.def index 4fd6d587..d0c89e28 100644 --- a/templates/system/package/repository/node.def +++ b/templates/system/package/repository/node.def @@ -1,14 +1,11 @@ tag: type: txt -help: "Repository name" -# bug 1847: remove the previous repo line before adding new line. -# need to prohibit '!' in repo name (sed delimiter) -syntax: pattern $(@) "^[^!]+$" ; "Do not use '!' in repository name" -create: "sudo sh -c \"touch /etc/apt/sources.list && \ -sed -i '\\!/ $(@) !d' /etc/apt/sources.list && \ -echo \\\"deb $(url/@)/ $(@) $(component/@)\\\" >> /etc/apt/sources.list\" " +help: "Name describing the repository" +commit: $(./url/) != ""; "Must configure the repository URL" +commit: $(./distribution/) != ""; "Must configure the repository distribution" +commit: $(./components/) != ""; "Must configure the repository component" update: "sudo sh -c \"touch /etc/apt/sources.list && \ -sed -i '\\!/ $(@) !d' /etc/apt/sources.list && \ -echo \\\"deb $(url/@)/ $(@) $(component/@)\\\" >> /etc/apt/sources.list\" " +sed -i '\\!# $(@) #!d' /etc/apt/sources.list && \ +echo \\\"deb $(url/@)/ $(distribution/@) $(components/@) # $(@) #\\\" >> /etc/apt/sources.list\" " delete: "sudo sh -c \"touch /etc/apt/sources.list && \ -sed -i '\\! $(@) $(component/@)!d' /etc/apt/sources.list\" " +sed -i '\\!# $(@) #!d' /etc/apt/sources.list\" " diff --git a/templates/system/package/repository/node.tag/component/node.def b/templates/system/package/repository/node.tag/component/node.def deleted file mode 100644 index e87f88de..00000000 --- a/templates/system/package/repository/node.tag/component/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: "Repository component names" diff --git a/templates/system/package/repository/node.tag/components/node.def b/templates/system/package/repository/node.tag/components/node.def new file mode 100644 index 00000000..3cc0dc24 --- /dev/null +++ b/templates/system/package/repository/node.tag/components/node.def @@ -0,0 +1,4 @@ +type: txt +help: "Repository component names" +# need to prohibit '!' in repo name (sed delimiter) +syntax: pattern $(@) "^[^!]+$" ; "Do not use '!' in component name" diff --git a/templates/system/package/repository/node.tag/distribution/node.def b/templates/system/package/repository/node.tag/distribution/node.def new file mode 100644 index 00000000..ad54b70d --- /dev/null +++ b/templates/system/package/repository/node.tag/distribution/node.def @@ -0,0 +1,4 @@ +type: txt +help: "Distribution name" +# need to prohibit '!' in repo name (sed delimiter) +syntax: pattern $(@) "^[^!]+$" ; "Do not use '!' in distribution name" diff --git a/templates/system/package/repository/node.tag/url/node.def b/templates/system/package/repository/node.tag/url/node.def index 0e304b91..ae05e6c6 100644 --- a/templates/system/package/repository/node.tag/url/node.def +++ b/templates/system/package/repository/node.tag/url/node.def @@ -1,2 +1,4 @@ type: txt help: "Repository URL" +# need to prohibit '!' in url (sed delimiter) +syntax: pattern $(@) "^[^!]+$" ; "Do not use '!' in url" |