Skip to content

Commit a4f876c

Browse files
committed
DLPX-89763 DLPX-86523 delphix-platform changes
PR URL: https://www.github.com/delphix/delphix-platform/pull/477
1 parent ca767ef commit a4f876c

File tree

2 files changed

+40
-3
lines changed
  • debian
  • files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks

2 files changed

+40
-3
lines changed

debian/preinst

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash -eux
2+
#
3+
# Copyright 2024 Delphix
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
18+
case $1 in
19+
upgrade)
20+
sed -i 's|/export/home|/home|g' /etc/fstab
21+
mount /home
22+
echo $(mount | grep home)
23+
24+
if [[ -e /etc/auto.master ]]
25+
then
26+
auto_home_line="$(grep auto_home auto)"
27+
line_len=$(expr length "${auto_home_line}")
28+
if [ "$line_len" -gt 0 ]
29+
then
30+
sed -i 's|/home auto_home -nobrowse|#/home auto_home -nobrowse|g' auto
31+
systemctl restart autofs
32+
fi
33+
fi
34+
;;
35+
esac
36+
37+
exit 0

files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# it below; otherwise that task will fail.
2323
#
2424
- file:
25-
path: /export/home
25+
path: /home
2626
state: directory
2727
mode: 0755
2828

@@ -35,7 +35,7 @@
3535
shell: /bin/bash
3636
create_home: yes
3737
comment: Delphix User
38-
home: /export/home/delphix
38+
home: /home/delphix
3939

4040
#
4141
# In order for this locale to be used (e.g. by virtualization) we need
@@ -689,7 +689,7 @@
689689
690690
- name: Source bash completion
691691
blockinfile:
692-
dest: "/export/home/delphix/.bashrc"
692+
dest: "/home/delphix/.bashrc"
693693
block: |
694694
. /etc/bash_completion.d/systemctl
695695
. /etc/bash_completion.d/zfs

0 commit comments

Comments
 (0)