Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
18
Merge Requests
18
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
fdbc9fc4
Commit
fdbc9fc4
authored
Sep 08, 2022
by
Boxiang Sun
Browse files
Options
Browse Files
Download
Plain Diff
slapos_web_deploy: Add support for Kylin v10 and Ubuntu 22.04(jammy)
See merge request
nexedi/slapos.core!415
parents
a5335308
45968461
Pipeline
#23403
passed with stage
in 0 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
master/bt5/slapos_web_deploy/PathTemplateItem/web_page_module/deploy_base_setup.txt
...oy/PathTemplateItem/web_page_module/deploy_base_setup.txt
+1
-1
master/bt5/slapos_web_deploy/PathTemplateItem/web_page_module/deploy_base_setup.xml
...oy/PathTemplateItem/web_page_module/deploy_base_setup.xml
+3
-3
master/bt5/slapos_web_deploy/PathTemplateItem/web_page_module/deploy_function_common.txt
...thTemplateItem/web_page_module/deploy_function_common.txt
+1
-1
master/bt5/slapos_web_deploy/PathTemplateItem/web_page_module/deploy_function_common.xml
...thTemplateItem/web_page_module/deploy_function_common.xml
+3
-3
No files found.
master/bt5/slapos_web_deploy/PathTemplateItem/web_page_module/deploy_base_setup.txt
View file @
fdbc9fc4
...
...
@@ -40,7 +40,7 @@ fi
# Warn users who aren't on an explicitly supported distro, but allow them to
# override check and attempt installation with ``export FORCE=yes``
if [[ ! ${DISTRO} =~ (jessie|stretch|buster|bullseye|xenial|bionic|focal|rhel7) ]]; then
if [[ ! ${DISTRO} =~ (jessie|stretch|buster|bullseye|xenial|bionic|focal|
jammy|Kylin-v10.|
rhel7) ]]; then
echo "WARNING: this script has not been tested on $DISTRO"
if [[ "$FORCE" != "yes" ]]; then
die $LINENO "If you wish to run this script anyway run with FORCE=yes"
...
...
master/bt5/slapos_web_deploy/PathTemplateItem/web_page_module/deploy_base_setup.xml
View file @
fdbc9fc4
...
...
@@ -229,7 +229,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
superthomas
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -243,7 +243,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
983.43382.56440.40994
</string>
</value>
<value>
<string>
1002.45292.9274.8618
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -261,7 +261,7 @@
</tuple>
<state>
<tuple>
<float>
1
589294310.44
</float>
<float>
1
662129388.41
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
master/bt5/slapos_web_deploy/PathTemplateItem/web_page_module/deploy_function_common.txt
View file @
fdbc9fc4
...
...
@@ -229,7 +229,7 @@ function GetOSVersion {
os_RELEASE=$(lsb_release -r -s)
os_UPDATE=""
os_PACKAGE="rpm"
if [[ "Debian,Ubuntu,LinuxMint,Raspbian" =~ $os_VENDOR ]]; then
if [[ "Debian,Ubuntu,LinuxMint,Raspbian
,Kylin
" =~ $os_VENDOR ]]; then
os_PACKAGE="deb"
elif [[ "SUSE LINUX" =~ $os_VENDOR ]]; then
lsb_release -d -s | grep -q openSUSE
...
...
master/bt5/slapos_web_deploy/PathTemplateItem/web_page_module/deploy_function_common.xml
View file @
fdbc9fc4
...
...
@@ -229,7 +229,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
superrafael
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -243,7 +243,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
955.8019.54919.28262
</string>
</value>
<value>
<string>
1002.45274.1920.60381
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -261,7 +261,7 @@
</tuple>
<state>
<tuple>
<float>
1
478535616.09
</float>
<float>
1
662129369.12
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment